Saved from username errors in template.
Merge branch 'develop'