Merge branch 'v0.10.19-release' into v0.10
authorTimothy J Fontaine <tjfontaine@gmail.com>
Tue, 24 Sep 2013 22:10:10 +0000 (15:10 -0700)
committerTimothy J Fontaine <tjfontaine@gmail.com>
Tue, 24 Sep 2013 22:10:10 +0000 (15:10 -0700)

Trivial merge