Merge branch 'master' of github.com:AUS3RIS/omniauth-local