Merge pull request #1021 from frntz/master

Fix escapeMarkup regexp

select2.js

@@ -2721,7 +2721,7 @@ the specific language governing permissions and limitations under the Apache Lic
                 "/": '/'
             };
 
-            return String(markup).replace(/[&<>"'/\\]/g, function (match) {
+            return String(markup).replace(/[&<>"'\/\\]/g, function (match) {
                     return replace_map[match[0]];
             });
         },