Merge branch 'master' into david_williams/testMultiSets

Conflicts:
	rap.b3aggrcon