beremiz

Merged in Andrey's branch

2018-09-12, Edouard Tisserant
56f1d8aca886
Merged in Andrey's branch
/**
* No platform specific code for "Generic" target
**/