Minor change to the editing xhtml.
Merge branch 'master' into tjosan