beremiz

merge

2018-06-11, Edouard Tisserant
bcf346f558bd
merge
/**
* No platform specific code for "Generic" target
**/