beremiz

Merge

2020-06-16, Tomaz Orac
45f1ff6a7f87
Merge
/**
* No platform specific code for "Generic" target
**/