Fixes error on Travis CI.
Fixes error on Travis CI.
Fixes error on Travis CI.
Merge remote-tracking branch 'upstream/develop' into faster_test