Sort out production deployment on Apache/mod_wsgi
Merge remote branch 'origin/master'