fix for Bug #1790
Merge branch 'Testing_Release_1.0' into LiamTestCase755Fix