Merge branch 'hotfix/1.6.4'
Fix locale support for the datetimepicker
Merge branch 'hotfix/1.6.5' into develop