Merge branch 'v0.10.14-release' into v0.10
authorTimothy J Fontaine <tjfontaine@gmail.com>
Thu, 25 Jul 2013 20:53:45 +0000 (13:53 -0700)
committerTimothy J Fontaine <tjfontaine@gmail.com>
Thu, 25 Jul 2013 20:53:45 +0000 (13:53 -0700)

Trivial merge