Attempt to fix clang build in travis-ci.
Merge branch 'travis-ci' into develop