Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Also override softtabstop on html and javascript, to truly use 2 space tabs on them
Merge branch 'fix-2space-tabs-web' into develop
Changelog for version 4.5.1
Merge branch 'changelog-v4.5.1' into develop