Merge branch 'master' into develop
Fixing broken Doctrine connection handling
Final changes for 2.0.0
Merge branch 'develop'