beremiz

Long due merge

2019-03-11, Edouard Tisserant
48ebcbe7f19b
Long due merge
/**
* No platform specific code for "Generic" target
**/