Fixed remarks on issue #18937
Merge branch 'development' of https://github.com/tdvsdv/usability into development
Merge branch 'development'

Conflicts:
	app/views/errors/error_status.html.erb