Merge branch 'hotfix/0.1.18' into develop
fix typo in Changes log
Merge branch 'master' of github.com:rsimoes/Mozilla-PublicSuffix