More 1.10 updates

The same thing as previously
Merge branch 'master' of github.com:mpasternak/dojango into mpasternak-master

Conflicts:
	dojango/forms/widgets.py