beremiz

merge

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