Bug #25285
Merge remote-tracking branch 'origin/master'

Conflicts:
	trunk/assets/frontend/css/auth.css