Merge remote-tracking branch 'localweb/master' into mozmaster

Conflicts:
	lib/gcli/nls/strings.js
	lib/gcli/ui/menu.html
	lib/gcli/ui/terminal.css
	lib/gcli/ui/terminal.html
	lib/gcli/ui/terminal.js
Merge remote-tracking branch 'mozilla/noscroll-983712' into mozmaster