Merge branch 'Add-travis-testing'.