Had a nightmare we were using CKEditor instead of Redactor. Found an encoding issue with DOMDocument when using Redactor
Merge branch 'master' into develop