Updated error message
Make sure html is purified before it is stored.
Fixed test
Merge remote-tracking branch 'origin/master' into release