Fix #263 Merge McMaster 12.1 MCEDT committed on Dec 4, 2014