Merge remote-tracking branch 'ry/v0.10'
authorisaacs <i@izs.me>
Sat, 31 Aug 2013 18:29:51 +0000 (11:29 -0700)
committerisaacs <i@izs.me>
Sat, 31 Aug 2013 18:29:51 +0000 (11:29 -0700)

Trivial merge