Merge branch 'v0.10.18-release' into v0.10
authorTimothy J Fontaine <tjfontaine@gmail.com>
Wed, 4 Sep 2013 18:25:04 +0000 (11:25 -0700)
committerTimothy J Fontaine <tjfontaine@gmail.com>
Wed, 4 Sep 2013 18:25:04 +0000 (11:25 -0700)

Trivial merge