Merge: rev765 (UTC all the things!)