Merge branch 'master' into openid-week4

And fix the PEP8 conflicts.