beremiz

merge

2019-01-07, Andrey Skvortsov
e582e8ddd0c8
merge
/**
* No platform specific code for "Generic" target
**/