Merge branch 'develop'
Merge branch 'develop'
Merge branch 'master' of http://github.com/bshaffer/oauth2-server-php into develop
links to docs for error message