Fix for magic my page
Merge branch 'i18962'

Conflicts:
	assets/javascripts/usability.js