Sync before vacation
Merge branch 'master' of github.com:Ebonwumon/oauth-server