Merge: rev763 (use UTC as the time zone)