Merge branch 'v0.10.26-release' into v0.10
authorTimothy J Fontaine <tjfontaine@gmail.com>
Wed, 19 Feb 2014 00:40:23 +0000 (16:40 -0800)
committerTimothy J Fontaine <tjfontaine@gmail.com>
Wed, 19 Feb 2014 00:40:23 +0000 (16:40 -0800)

Trivial merge