[1.13] Bugfixes for jQuery <-> Redactor conflict#905

kirichkov wants to merge 4 commits intocomfy:1.13comfy/comfortable-mexican-sofa:1.13from

simplicitybg:1.13.1simplicitybg/comfortable-mexican-sofa:1.13.1Copy head branch name to clipboard