Merge branch 'hotfix-1.1.1'
Merge branch 'release-1.2'
fixed problems with merge of tiling feature
Merge branch 'hotfix-1.2'
Merge tag 'hotfix-1.2' into develop

fixed issues with merge