[DF-3299] fix for heightmap editor
Merge branch 'origin/framework_0_5_5'