Merge branch 'v0.10.21-release' into v0.10
authorTimothy J Fontaine <tjfontaine@gmail.com>
Fri, 18 Oct 2013 22:39:56 +0000 (15:39 -0700)
committerTimothy J Fontaine <tjfontaine@gmail.com>
Fri, 18 Oct 2013 22:39:56 +0000 (15:39 -0700)

Trivial merge