beremiz

merge

2019-04-09, Edouard Tisserant
adfdeaba5a6a
merge
/**
* No platform specific code for "Generic" target
**/