beremiz

merge

2019-02-21, Andrey Skvortsov
61324adaa29a
merge
/**
* No platform specific code for "Generic" target
**/