Merge branch 'hotfix/0.6.1'
use --result-file for sql-dump to prevent problems with limited hosting-settings
Merge branch 'hotfix/0.6.2' into develop