Last-minute changes before 20130815 WD.
Merge branch 'master' of https://github.com/tkochi-w3c/imeapi_draft
Import change made by ArtB.
Merge branch 'master' into gh-pages