Merge branch 'develop', remote-tracking branch 'upstream/develop' into develop
disable simply of polygons for roads #1300
Merge pull request #1313 from assefay/develop

Disable polygon simplify