Merge branch 'v0.8.17-release' into v0.8
authorisaacs <i@izs.me>
Thu, 10 Jan 2013 01:07:21 +0000 (17:07 -0800)
committerisaacs <i@izs.me>
Thu, 10 Jan 2013 01:07:21 +0000 (17:07 -0800)

Trivial merge