Added start/stop hour options to time picker.
Merge remote-tracking branch 'upstream/master'