Fix for mixed content <p> tags.
Merge branch 'master' into development