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