Merge branch 'daniel/issue1778'

Conflicts:
	app/soc/modules/gsoc/views/profile.py