Merge branch 'develop' into staging
Merge branch 'staging' of github.com:caktus/pycon into staging