Testing the new Docker stack of Travis-CI
Reverting Travis stuff
Merge remote-tracking branch 'origin/master'