Datepicker: Merge with master

Sync datepicker branch with master branch.