PEP8
Merge remote-tracking branch 'upstream/develop' into develop

Conflicts:
	dfp/templatetags/dfp_tags.py