Merge remote-tracking branch 'origin/3.x' into 3.x

# Conflicts:
#	js/inputmask.js

js/inputmask.js

@@ -2636,11 +2636,11 @@
 
 			function renderColorMask(input, buffer, caretPos) {
 				function handleStatic() {
-					if (!static && (test.fn === null || testPos.input === undefined)) {
-						static = true;
+					if (!isStatic && (test.fn === null || testPos.input === undefined)) {
+						isStatic = true;
 						maskTemplate += "<span class='im-static''>"
-					} else if (static && (test.fn !== null && testPos.input !== undefined)) {
-						static = false;
+					} else if (isStatic && (test.fn !== null && testPos.input !== undefined)) {
+						isStatic = false;
 						maskTemplate += "</span>"
 					}
 				}
@@ -2653,7 +2653,7 @@
 						caretPos = {begin: caretPos, end: caretPos};
 					}
 
-					var maskTemplate = "", static = false;
+					var maskTemplate = "", isStatic = false;
 					if (buffer != "") {
 						var ndxIntlzr, pos = 0,
 							test, testPos, lvp = getLastValidPosition();