beremiz

merge

2018-06-18, Andrey Skvortsov
49a6738b7c63
merge
/**
* No platform specific code for "Generic" target
**/