Merge branch 'master' into add_jira

Conflicts:
	mysite/customs/tests.py