Can no longer rely upon user.username with the advent of custom user models.
Merge branch 'next' into template_upgrades