Merge branch 'v0.10.23-release' into v0.10
authorTimothy J Fontaine <tjfontaine@gmail.com>
Thu, 12 Dec 2013 06:11:06 +0000 (22:11 -0800)
committerTimothy J Fontaine <tjfontaine@gmail.com>
Thu, 12 Dec 2013 06:11:06 +0000 (22:11 -0800)

Trivial merge