Merge remote-tracking branch 'origin/SRS' into SRS

Conflicts:
	documentation/SRS/SRS.pdf