Merge branch 'v0.10.32-release' into v0.10
authorTimothy J Fontaine <tjfontaine@gmail.com>
Tue, 16 Sep 2014 23:52:57 +0000 (16:52 -0700)
committerTimothy J Fontaine <tjfontaine@gmail.com>
Tue, 16 Sep 2014 23:52:57 +0000 (16:52 -0700)

Trivial merge