Better guarded against editor introducing entities into a placeholder
Removed the constant ENT_HTML401

This constant is not defined until PHP5.4
Merge branch '2.0a6'