Merge branch 'hotfix-1.5.2'
Hotfix for dates.
A few more quick fixes.
Merge branch 'master' into develop

Merging in some very new hotfixes.