Merge branch 'develop' of https://github.com/phpDocumentor/phpDocumentor2 into develop
Merge branch 'develop' of github.com:rgeraads/phpDocumentor2 into develop