Rebased
Merge branch 'master' of github.com:biancini/pyoidc_rp_django