Bug #22 : Merge bug fixes from McMaster git branch RELEASE_12_1