Merge branch 'hotfix/1.3.6'
Merge branch 'release/1.4'

Fixes #137
Cleanup huge migration script clusterfuck
Merge branch 'master' into develop
Merge remote-tracking branch 'origin/master' into develop