Merge branch 'master' into wip/sbtopts-crlf

src/universal/bin/sbt

@@ -136,7 +136,8 @@ process_my_args () {
 }
 
 loadConfigFile() {
-  cat "$1" | sed '/^\#/d;s/\r$//' | while read line; do
+  # Make sure the last line is read even if it doesn't have a terminating \n
+  cat "$1" | sed '/^\#/d;s/\r$//' | while read -r line || [[ -n "$line" ]]; do
     eval echo $line
   done
 }