Minor documentation update on build options to better use of space.
Minor fix for consistent behaviour immediately after viewport setup.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	Readme.txt