Make errorcodes.py return a non-zero code on failure
Merge remote-tracking branch 'upstream/master'