Fix typo
Merge branch 'develop' of github.com:phpDocumentor/phpDocumentor2 into develop
Update lock file to new asset installer
Merge branch 'master' into develop