Merge branch 'v0.10.31-release' into v0.10
authorTimothy J Fontaine <tjfontaine@gmail.com>
Tue, 19 Aug 2014 22:12:21 +0000 (18:12 -0400)
committerTimothy J Fontaine <tjfontaine@gmail.com>
Tue, 19 Aug 2014 22:12:21 +0000 (18:12 -0400)

Trivial merge