Merge branch 'v0.10.11-release' into v0.10
authorisaacs <i@izs.me>
Thu, 13 Jun 2013 18:36:41 +0000 (11:36 -0700)
committerisaacs <i@izs.me>
Thu, 13 Jun 2013 18:36:41 +0000 (11:36 -0700)

Trivial merge