Merge branch 'release/4.1' into develop
Merge branch 'develop' of https://github.com/carlgevans/doctrineships