Replaced instances of 'his/her' with 'their'.
Merge branch 'master' into groups

Conflicts:
	django/contrib/auth/models.py