beremiz

merge

2018-10-03, Andrey Skvortsov
9554952d36d7
merge
/**
* No platform specific code for "Generic" target
**/