Automated merge with ssh://pycon.it:443/pycon-stuff/pycon_site
Automated merge with ssh://pycon.it:443/pycon-stuff/pycon_site


Former-commit-id: 5571feca5fbc35c713b24e30b4150989842ca54a
artcz/epcon,matrixise/epcon,malemburg/epcon,malemburg/epcon,artcz/epcon,leriomaggio/pycon_site,PythonSanSebastian/epcon,matrixise/epcon,pythonitalia/pycon_site,matrixise/epcon,barrachri/epcon,barrachri/epcon,barrachri/epcon,EuroPython/epcon,pythonitalia/pycon_site,EuroPython/epcon,malemburg/epcon,artcz/epcon,malemburg/epcon,barrachri/epcon,PythonSanSebastian/epcon,barrachri/epcon,artcz/epcon,matrixise/epcon,matrixise/epcon,malemburg/epcon,PythonSanSebastian/epcon,EuroPython/epcon,PythonSanSebastian/epcon,pythonitalia/pycon_site,artcz/epcon,PythonSanSebastian/epcon,malemburg/epcon,barrachri/epcon,pythonitalia/pycon_site,artcz/epcon,leriomaggio/pycon_site,leriomaggio/pycon_site,matrixise/epcon,PythonSanSebastian/epcon,leriomaggio/pycon_site,leriomaggio/pycon_site,pythonitalia/pycon_site,EuroPython/epcon