Updated ChangeLog
Updated Unbescape dependency version to 1.1.0-SNAPSHOT
Merge branch '2.1-master' into 2.1-dev