Emulate VT525's curious glitch (https://gist.github.com/ttdoda/5902671)
Minor fix
Merge branch 'develop'

Conflicts:
	modules/session_components/screen.js