* commit '1ebd8c11f73625050035b4fca35841a9e30bca04': Updated the Time/Date pickers to be backwards compatible