Merge branch 'master' of github.com:bshaffer/oauth2-server-php