Makes sure to use <p> tags around text [ for the sake of the css]
Merge branch 'master' into caching