Restored previous formatting.
Merge branch 'master' into textcontent