HTML entities for updating entries
Merge branch '3.0' into 3.1