Fix a duplication in error codes
Merge remote-tracking branch 'upstream/master'