Merge branch 'v0.11.3-release'
authorisaacs <i@izs.me>
Wed, 26 Jun 2013 23:55:46 +0000 (16:55 -0700)
committerisaacs <i@izs.me>
Wed, 26 Jun 2013 23:55:46 +0000 (16:55 -0700)

Trivial merge