beremiz

re-merge

2018-03-25, Edouard Tisserant
6b357f1e3134
re-merge
/**
* No platform specific code for "Generic" target
**/