Addressed Travis CI feedback
Merge branch 'bug947300' into bug947303
Addressed Travis CI feedback