Merge branch 'v0.8.20-release' into v0.8
authorisaacs <i@izs.me>
Fri, 15 Feb 2013 19:23:55 +0000 (11:23 -0800)
committerisaacs <i@izs.me>
Fri, 15 Feb 2013 19:23:55 +0000 (11:23 -0800)

Trivial merge