Catchup to upstream

Start to rebuild to match upstream travis-ci integration.