Merge branch 'v0.10.15-release' into v0.10
authorTimothy J Fontaine <tjfontaine@gmail.com>
Fri, 26 Jul 2013 00:02:38 +0000 (17:02 -0700)
committerTimothy J Fontaine <tjfontaine@gmail.com>
Fri, 26 Jul 2013 00:02:38 +0000 (17:02 -0700)

Trivial merge