Merged changes from AFRL SORCER - including update to 4.2.2 + Mike's changes from 23.08.2014