Merge commit 'b1451ad859183ae48c624d19ec144306bd2d3e3a'
authorAndy Wingo <wingo@pobox.com>
Thu, 22 Jan 2015 11:46:11 +0000 (12:46 +0100)
committerAndy Wingo <wingo@pobox.com>
Thu, 22 Jan 2015 11:46:11 +0000 (12:46 +0100)

Trivial merge