Even clearer error messages
Merge branch 'master' into workshop