am 324a98f1: merge from open-source master

Merge commit '324a98f1901fb84ec4c88196e01c3e14c2b5a4a4' into kraken

* commit '324a98f1901fb84ec4c88196e01c3e14c2b5a4a4':
  sh: Fix problem with stray '\r' character that was introduced in previous change

sh/input.c

@@ -221,7 +221,7 @@ retry:
                     /* Add non-blank lines to history. */
                     linenoiseHistoryAdd(rl_start);
                 }
-                out2str("\r\n");
+                out2str("\n");
                 /* Client expects a newline at end of input, doesn't expect null */
                 rl_start[el_len++] = '\n';
             }