Remerged SOcheck with master

Merge remote-tracking branch 'remotes/trinker/SOcheck' into SOcheck

Conflicts:
	DESCRIPTION
	NAMESPACE