Merge branch 'v0.10.20-release' into v0.10
authorTimothy J Fontaine <tjfontaine@gmail.com>
Mon, 30 Sep 2013 22:06:02 +0000 (15:06 -0700)
committerTimothy J Fontaine <tjfontaine@gmail.com>
Mon, 30 Sep 2013 22:06:02 +0000 (15:06 -0700)

Trivial merge