#224 Fix URL unfriendly passwords
Merge branch 'version2.0' into version2.1