beremiz

merge

2018-01-29, Edouard Tisserant
d0b1ffcb9368
merge
/**
* No platform specific code for "Generic" target
**/