Broken build caused by new oauth2 commits fixed.
Merge branch 'denizeren-master'

Conflicts:
	oauth2.go