Integration PR for travis

This is a integration branch for Travis builds.