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