Fix travis.
Merge remote-tracking branch 'origin/master' into frontend_subm