Merge remote-tracking branch 'ry/v0.10'
authorisaacs <i@izs.me>
Sun, 1 Sep 2013 00:58:44 +0000 (17:58 -0700)
committerisaacs <i@izs.me>
Sun, 1 Sep 2013 00:58:44 +0000 (17:58 -0700)

Trivial merge