Commit 43955927e4b4ad004443f07cb5611a1f0ce282a4

Carlos Martín Nieto 2016-02-23T22:27:36

Merge pull request #3631 from ethomson/giterr_fixups Minor `giterr` fixups