Merge branch 'dev' into project-reorganisation

Session/VT100Terminal.m

@@ -2621,7 +2621,7 @@ static VT100TCC decode_string(unsigned char *datap,
           if (shape >= 0 && shape < sizeof(shapeMap)/sizeof(int)) {
             [[[SCREEN session] TEXTVIEW] setCursorType:shapeMap[shape]];
           }
-        } else if ([key isEqualToString:@"BounceDockIcon"]) {
+        } else if ([key isEqualToString:@"RequestAttention"]) {
             if ([value boolValue]) {
                 shouldBounceDockIcon = [NSApp requestUserAttention:NSCriticalRequest];
             } else {