beremiz

Merge

2016-10-04, Andrey Skvortsov
b3c43aa29d94
Merge
/**
* No platform specific code for "Generic" target
**/