Merge branch 'v0.10.22-release' into v0.10
authorTimothy J Fontaine <tjfontaine@gmail.com>
Tue, 12 Nov 2013 20:53:28 +0000 (12:53 -0800)
committerTimothy J Fontaine <tjfontaine@gmail.com>
Tue, 12 Nov 2013 20:53:28 +0000 (12:53 -0800)

Trivial merge