beremiz

merged

2018-08-06, Edouard Tisserant
fe3394697b02
merged
/**
* No platform specific code for "Generic" target
**/