Merge commit 'v0.8.16' into v0.8
authorisaacs <i@izs.me>
Thu, 13 Dec 2012 19:50:15 +0000 (11:50 -0800)
committerisaacs <i@izs.me>
Thu, 13 Dec 2012 19:50:15 +0000 (11:50 -0800)

Trivial merge