Merge latest Travis testing updates from develop branch into pubsub branch.