(cherry picked from commit 497593e297c1ed4708ff7e5faf2d90a37d8b2be9)

Conflicts:
	app/assets/stylesheets/pages/profile.scss