Merge branch 'v0.10.24-release' into v0.10
authorTimothy J Fontaine <tjfontaine@gmail.com>
Thu, 19 Dec 2013 17:03:45 +0000 (09:03 -0800)
committerTimothy J Fontaine <tjfontaine@gmail.com>
Thu, 19 Dec 2013 17:03:45 +0000 (09:03 -0800)

Trivial merge