Backported fixes from master1.4
Optional count argument
Merge branch 'master' into master1.4

Conflicts:
	djprogress/__init__.py