Merge remote-tracking branch 'upstream/master' into 65_send_ctrl_l_r_key

diff --cc src/xterm.js
index ac06960d666eadb860c0504b1d8838995be638d7,4b3d7acd09ae1f6d27ff6245e3976faa4d87cb6c..a806a03de5ec59c6c77a5f2f2451a3d8461a786d
--- 1/src/xterm.js
--- 2/src/xterm.js
+++ b/src/xterm.js
@@@ -2423,15 -2379,24 +2427,21 @@@
              break;
            }
            if (ev.ctrlKey) {
 -            this.scrollDisp(1);
 -            return this.cancel(ev);
 +            result.scrollDisp = 1;
            } else {
 -            key = '\x1b[B';
 +            result.key = '\x1b[B';
            }
            break;
 -        // delete
 -        case 46:
 -          key = '\x1b[3~';
 -          break;
          // insert
-         case 45: result.key = '\x1b[2~'; break;
+         case 45:
+           if (!ev.shiftKey && !ev.ctrlKey) {
+             // <Ctrl> or <Shift> + <Insert> are used to
+             // copy-paste on some systems.
 -            key = '\x1b[2~';
++            result.key = '\x1b[2~';
+           }
+           break;
 +        // delete
 +        case 46: result.key = '\x1b[3~'; break;
          // home
          case 36:
            if (this.applicationKeypad) {