Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Merge branch '1.3.6-fix-s3-timeout'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'master' of github.com:devbridge/BetterCMS
Merge branch 'dev'
#840: master page properties saving updated.
Merge branch 'dev_1.4.0_fix840'
Merge branch 'master' into dev