Merge branch 'datetimepicker_bug'