beremiz

merge

2018-06-23, Edouard Tisserant
09d5d1456616
merge
/**
* No platform specific code for "Generic" target
**/