Merge commit '35733757bd1644f1fd67dc3a055391d1f167c4f2' * commit '35733757bd1644f1fd67dc3a055391d1f167c4f2': Hook the 12- or 24-hour time format checkbox back up.
Merge commit '35733757bd1644f1fd67dc3a055391d1f167c4f2' * commit '35733757bd1644f1fd67dc3a055391d1f167c4f2': Hook the 12- or 24-hour time format checkbox back up.