GEB-357 Update to use full classname in exception message
Merge remote-tracking branch 'origin/master'