python 2.7
Merge branch 'master' into theradiocc

Conflicts:
	apache/django.wsgi