parsinng p tag to br, fixes #6663
Merge branch 'dev' into test