Merge branch 'release/2.0.3' into develop
Unescape button.  Fixes #7.
2.0.4
Merge branch 'release/2.0.4'