Uniformize exception messages
Merge branch 'gd-open' of github.com:vlakoff/Imagine into vlakoff-gd-open
Merge branch 'master' into develop