re #91 : Rename escape() to setEscape() and add getEscape().
Merge remote-tracking branch 'origin/develop' into develop