Merge branch 'v0.10.17-release' into v0.10
authorTimothy J Fontaine <tjfontaine@gmail.com>
Wed, 21 Aug 2013 23:37:31 +0000 (16:37 -0700)
committerTimothy J Fontaine <tjfontaine@gmail.com>
Wed, 21 Aug 2013 23:37:31 +0000 (16:37 -0700)

Trivial merge