2010-05-25 Mark Rowe Merge r60110. 2010-05-24 Jer Noble Reviewed by Eric Carlson. HTML5