Correct line length
Merge branch '3.0' into 3.1
Correct errors from differening behaviour between 3.0 and 3.1
Correct line length and indentation
Merge branch '3.1'

Conflicts:
	view/SSViewer.php
Correct line length and endings