++MED
++RAC
++RAC
Merge remote-tracking branch 'origin/master' into rac-3.0

Conflicts:
	External/Archimedes
++RAC