Fixed #3152.
Fixed #3152.
Merge branch 'v7.0-kelley' into v7.0-travis