Merge remote-tracking branch 'upstream/master'

.travis.yml

@@ -22,6 +22,6 @@ before_install:
 script:
   - runghc Make.hs build prelude all --verbose
   - rm -rf dist
-  - bash Make.sh --dest=dist-bash --verbose
-  - rm -rf dist
+  - mkdir dist-bash ; bash Make.sh --dest=dist-bash --verbose
+  - rm -rf dist ; mkdir dist-bat
   - if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then cmd //c Make.bat --dest=dist-bat --verbose ; fi