better multisite support
Merge branch 'hotfix/0.3.1'
Merge branch 'hotfix/0.3.1' into develop
Merge branch 'develop'