beremiz

Merge

2018-05-23, Edouard Tisserant
c76d4be6f438
Merge
/**
* No platform specific code for "Generic" target
**/