3906484 Merge branch 'master' into blockerbugs

Merged and Committed by frantisekz 5 years ago
    Merge branch 'master' into blockerbugs