Sync with http://html5.org/r/8732 (Sync with MQ4)