Merge branch 'v0.8.18-release' into v0.8
authorisaacs <i@izs.me>
Fri, 18 Jan 2013 20:51:14 +0000 (12:51 -0800)
committerisaacs <i@izs.me>
Fri, 18 Jan 2013 20:51:14 +0000 (12:51 -0800)

Trivial merge