[AMOS commit] MDL-22504 Fixed issues raised by Sam Hemelryk Committed into Git: 2012-05-04 11:12 UTC