Commit 8371457ce2c13c81ae7328319d3b3ac4de3ebfaa

Edward Thomson 2014-10-09T11:32:26

Merge pull request #2597 from ethomson/fixup Trivial fixups