Merge branch 'v0.10.30-release' into v0.10
authorTimothy J Fontaine <tjfontaine@gmail.com>
Thu, 31 Jul 2014 18:11:53 +0000 (11:11 -0700)
committerTimothy J Fontaine <tjfontaine@gmail.com>
Thu, 31 Jul 2014 18:11:53 +0000 (11:11 -0700)

Trivial merge