travis_ci
bugfix
Merge branch 'travis_ci' into SPARK-1291_bug