Restored previous formatting.
Merge branch 'master' into textcontent
Merge branch 'textcontent' into 0.9.5-dev