diff --git a/wp-admin/js/post-formats.min.js b/wp-admin/js/post-formats.min.js
index c2fd02639f..35a470d7c7 100644
--- a/wp-admin/js/post-formats.min.js
+++ b/wp-admin/js/post-formats.min.js
@@ -1 +1 @@
-window.wp=window.wp||{};(function(f){var a,p,b,g,d,j=360,k,h="standard",m="short-format",o=["status","aside"],l=["standard","chat","status","aside","gallery"],e=f(".icon32");function c(q){a.get(0).className=a.get(0).className.replace(/\s?\bwp-format-[^ ]+/g,"");a.addClass("wp-format-"+q);e.get(0).className=e.get(0).className.replace(/\s?\bwp-format-[^ ]+/g,"");e.addClass("wp-format-"+q)}function n(s,r){var q;k=f("#content, #content_ifr");q=k.height();if(120<q){j=q}if(-1<f.inArray(s,o)){if(!k.hasClass(m)){k.addClass(m);if(r){k.each(function(){f(this).css({height:120})})}else{k.each(function(){f(this).animate({height:120})})}}}else{k.removeClass(m).animate({height:j})}}function i(w){var s,q,r=w.parent(),v=w.data("wp-format"),t=f(".post-format-description"),u=f("#title");if(typeof a==="undefined"){a=f("#post-body-content")}r.slideUp().find("a.active").removeClass("active");w.addClass("active");f("#post_format").val(v);f(".post-format-change").show().find("span.icon").removeClass(postFormats.currentPostFormat).addClass(v);if(-1<f.inArray(v,l)){c(v);p.hide()}else{p.slideUp(200,function(){c(v);p.slideDown(400)})}n(v);u.focus();if(""===u.val()){f("#title-prompt-text").removeClass("screen-reader-text")}t.html(w.data("description"));if(t.not(":visible")){t.slideDown("fast")}if(typeof tinymce!="undefined"){s=tinymce.get("content");if(s){q=s.getBody();q.className=q.className.replace(/\bpost-format-[^ ]+/,"");s.dom.addClass(q,"post-format-"+v)}}postFormats.currentPostFormat=v}f(function(){p=f(".post-formats-fields");h=f(".post-format-options .active").data("wp-format");if(-1<f.inArray(h,o)){n(h,true)}f(".post-format-change a").click(function(){f(".post-formats-fields, .post-format-change").slideUp();f(".post-format-options").slideDown();return false});f(".post-format-options").on("click","a",function(q){q.preventDefault();i(f(this))});f(".wp-format-media-select").click(function(s){s.preventDefault();var q=f(this),u="image",t=q.closest(".wp-format-media-holder"),r=f("#wp_format_"+t.data("format"));u=t.data("format");if(b&&g===u){b.open();return}g=u;b=wp.media.frames.formatMedia=wp.media({button:{text:q.data("update")},states:[new wp.media.controller.Library({library:wp.media.query({type:u}),title:q.data("choose"),displaySettings:"image"===u})]});d=function(C){var v,y,z="",x=C.url,A=C.mime,B=C.type;if("video"===B){if(C.width){v=C.width;if(v>600){v=600}z+=' width="'+v+'"'}if(C.height){y=C.height;if(C.width&&v<C.width){y=Math.round((y*v)/C.width)}z+=' height="'+y+'"'}}f("#"+B+"-preview").remove();t.parent().prepend('<div id="'+B+'-preview" class="wp-format-media-preview"><'+B+z+' class="wp-'+B+'-shortcode" controls="controls" preload="none"><source type="'+A+'" src="'+x+'" /></'+B+"></div>");f(".wp-"+B+"-shortcode").mediaelementplayer()};b.on("select",function(){var v=0,y=0,x,z=b.state().get("selection").first().toJSON();if(0===z.mime.indexOf("audio")){r.val(z.url);d(z)}else{if(0===z.mime.indexOf("video")){z.src=z.url;r.val(wp.shortcode.string({tag:"video",attrs:_.pick(z,"src","width","height")}));d(z)}else{x=wp.media.string.image({align:getUserSetting("align"),size:getUserSetting("imgsize"),link:getUserSetting("urlbutton")},z);r.val(x);f("#image-preview").remove();if(z.width){v=z.width>600?600:z.width}if(z.height){y=z.height}if(v<z.width){y=Math.round((y*v)/z.width)}t.parent().prepend(['<div id="image-preview" class="wp-format-media-preview">','<img src="',z.url,'"',v?' width="'+v+'"':"",y?' height="'+y+'"':""," />","</div>"].join(""))}}});b.open()})})})(jQuery);
\ No newline at end of file
+window.wp=window.wp||{};(function(g){var a,q,b,h,e,k=360,l,c,i="standard",n="short-format",p=["status","aside"],m=["standard","chat","status","aside","gallery"],f=g(".icon32");function d(r){a.get(0).className=a.get(0).className.replace(/\s?\bwp-format-[^ ]+/g,"");a.addClass("wp-format-"+r);f.get(0).className=f.get(0).className.replace(/\s?\bwp-format-[^ ]+/g,"");f.addClass("wp-format-"+r)}function o(t,s){var r;l=g("#content, #content_ifr");r=l.height();if(120<r){k=r}if(-1<g.inArray(t,p)){if(!l.hasClass(n)){l.addClass(n);if(s){l.each(function(){g(this).css({height:120})})}else{l.each(function(){g(this).animate({height:120})})}}}else{l.removeClass(n).animate({height:k})}}function j(x){var t,r,s=x.parent(),w=x.data("wp-format"),u=g(".post-format-description"),v=g("#title");if(typeof a==="undefined"){a=g("#post-body-content")}s.slideUp().find("a.active").removeClass("active");x.addClass("active");g("#post_format").val(w);g(".post-format-change").show().find("span.icon").removeClass(postFormats.currentPostFormat).addClass(w);if(-1<g.inArray(w,m)){d(w);q.hide()}else{q.slideUp(200,function(){d(w);q.slideDown(400)})}o(w);v.focus();if(""===v.val()){g("#title-prompt-text").removeClass("screen-reader-text")}u.html(x.data("description"));if(u.not(":visible")){u.slideDown("fast")}if(typeof tinymce!="undefined"){t=tinymce.get("content");if(t){r=t.getBody();r.className=r.className.replace(/\bpost-format-[^ ]+/,"");t.dom.addClass(r,"post-format-"+w)}}c.toggleClass("gallery","gallery"===w);postFormats.currentPostFormat=w}g(function(){c=g("#insert-media-button").toggleClass("gallery","gallery"===postFormats.currentPostFormat);q=g(".post-formats-fields");i=g(".post-format-options .active").data("wp-format");if(-1<g.inArray(i,p)){o(i,true)}g(".post-format-change a").click(function(){g(".post-formats-fields, .post-format-change").slideUp();g(".post-format-options").slideDown();return false});g(".post-format-options").on("click","a",function(r){r.preventDefault();j(g(this))});g(".wp-format-media-select").click(function(t){t.preventDefault();var r=g(this),v="image",u=r.closest(".wp-format-media-holder"),s=g("#wp_format_"+u.data("format"));v=u.data("format");if(b&&h===v){b.open();return}h=v;b=wp.media.frames.formatMedia=wp.media({button:{text:r.data("update")},states:[new wp.media.controller.Library({library:wp.media.query({type:v}),title:r.data("choose"),displaySettings:"image"===v})]});e=function(D){var x,z,A="",y=D.url,B=D.mime,C=D.type;if("video"===C){if(D.width){x=D.width;if(x>600){x=600}A+=' width="'+x+'"'}if(D.height){z=D.height;if(D.width&&x<D.width){z=Math.round((z*x)/D.width)}A+=' height="'+z+'"'}}g("#"+C+"-preview").remove();u.parent().prepend('<div id="'+C+'-preview" class="wp-format-media-preview"><'+C+A+' class="wp-'+C+'-shortcode" controls="controls" preload="none"><source type="'+B+'" src="'+y+'" /></'+C+"></div>");g(".wp-"+C+"-shortcode").mediaelementplayer()};b.on("select",function(){var x=0,z=0,y,A=b.state().get("selection").first().toJSON();if(0===A.mime.indexOf("audio")){s.val(A.url);e(A)}else{if(0===A.mime.indexOf("video")){A.src=A.url;s.val(wp.shortcode.string({tag:"video",attrs:_.pick(A,"src","width","height")}));e(A)}else{y=wp.media.string.image({align:getUserSetting("align"),size:getUserSetting("imgsize"),link:getUserSetting("urlbutton")},A);s.val(y);g("#image-preview").remove();if(A.width){x=A.width>600?600:A.width}if(A.height){z=A.height}if(x<A.width){z=Math.round((z*x)/A.width)}u.parent().prepend(['<div id="image-preview" class="wp-format-media-preview">','<img src="',A.url,'"',x?' width="'+x+'"':"",z?' height="'+z+'"':""," />","</div>"].join(""))}}});b.open()})})})(jQuery);
\ No newline at end of file
diff --git a/wp-includes/js/media-editor.min.js b/wp-includes/js/media-editor.min.js
index 4c29258add..0bfc16842b 100644
--- a/wp-includes/js/media-editor.min.js
+++ b/wp-includes/js/media-editor.min.js
@@ -1 +1 @@
-(function(b){var a={};wp.media.string={props:function(f,i){var h,c,e,g,d,j=wp.media.view.settings.defaultProps;d=function(k){if("image"===k.type&&!k.alt){k.alt=k.caption||k.title||"";k.alt=k.alt.replace(/<\/?[^>]+>/g,"");k.alt=k.alt.replace(/[\r\n]+/g," ")}return k};f=f?_.clone(f):{};if(i&&i.type){f.type=i.type}if("image"===f.type){f=_.defaults(f||{},{align:j.align||getUserSetting("align","none"),size:j.size||getUserSetting("imgsize","medium"),url:"",classes:[]})}if(!i){return d(f)}f.title=f.title||i.title;h=f.link||j.link||getUserSetting("urlbutton","file");if("file"===h){c=i.url}else{if("post"===h){c=i.link}else{if("custom"===h){c=f.linkUrl}}}f.linkUrl=c||"";if("image"===i.type){f.classes.push("wp-image-"+i.id);g=i.sizes;e=g&&g[f.size]?g[f.size]:i;_.extend(f,_.pick(i,"align","caption","alt"),{width:e.width,height:e.height,src:e.url,captionId:"attachment_"+i.id})}else{if("video"===i.type||"audio"===i.type){_.extend(f,_.pick(i,"title","type","icon","mime"))}else{f.title=f.title||i.filename;f.rel=f.rel||"attachment wp-att-"+i.id}}return d(f)},link:function(d,e){var c;d=wp.media.string.props(d,e);c={tag:"a",content:d.title,attrs:{href:d.linkUrl}};if(d.rel){c.attrs.rel=d.rel}return wp.html.string(c)},audio:function(d,f){var e,c;d=wp.media.string.props(d,f);e={};if(d.mime){switch(d.mime){case"audio/mpeg":if(f.url.indexOf("mp3")){e.mp3=f.url}else{if(f.url.indexOf("m4a")){e.m4a=f.url}}break;case"audio/mp3":e.mp3=f.url;break;case"audio/m4a":e.m4a=f.url;break;case"audio/wav":e.wav=f.url;break;case"audio/ogg":e.ogg=f.url;break;case"audio/x-ms-wma":case"audio/wma":e.wma=f.url;break}}c=wp.shortcode.string({tag:"audio",attrs:e});return c},video:function(d,f){var e,c;d=wp.media.string.props(d,f);e={};if(f.width){e.width=f.width}if(f.height){e.height=f.height}if(d.mime){switch(d.mime){case"video/mp4":e.mp4=f.url;break;case"video/m4v":e.m4v=f.url;break;case"video/webm":e.webm=f.url;break;case"video/ogg":e.ogv=f.url;break;case"video/x-ms-wmv":case"video/wmv":case"video/asf":e.wmv=f.url;break;case"video/flv":case"video/x-flv":e.flv=f.url;break}}c=wp.shortcode.string({tag:"video",attrs:e});return c},image:function(g,i){var c={},d,f,h,e;g=wp.media.string.props(g,i);f=g.classes||[];c.src=typeof i!=="undefined"?i.url:g.url;_.extend(c,_.pick(g,"width","height","alt"));if(g.align&&!g.caption){f.push("align"+g.align)}if(g.size){f.push("size-"+g.size)}c["class"]=_.compact(f).join(" ");d={tag:"img",attrs:c,single:true};if(g.linkUrl){d={tag:"a",attrs:{href:g.linkUrl},content:d}}e=wp.html.string(d);if(g.caption){h={};if(c.width){h.width=c.width}if(g.captionId){h.id=g.captionId}if(g.align){h.align="align"+g.align}e=wp.shortcode.string({tag:"caption",attrs:h,content:e+" "+g.caption})}return e}};wp.media.gallery=(function(){var c={};return{defaults:{order:"ASC",id:wp.media.view.settings.post.id,itemtag:"dl",icontag:"dt",captiontag:"dd",columns:"3",size:"thumbnail",orderby:"menu_order ID"},attachments:function(h){var j=h.string(),d=c[j],f,e,i,g;delete c[j];if(d){return d}f=_.defaults(h.attrs.named,wp.media.gallery.defaults);e=_.pick(f,"orderby","order");e.type="image";e.perPage=-1;if("rand"===f.orderby){f._orderbyRandom=true}if(!f.orderby||/^menu_order(?: ID)?$/i.test(f.orderby)){e.orderby="menuOrder"}if(f.ids){e.post__in=f.ids.split(",");e.orderby="post__in"}else{if(f.include){e.post__in=f.include.split(",")}}if(f.exclude){e.post__not_in=f.exclude.split(",")}if(!e.post__in){e.uploadedTo=f.id}g=_.omit(f,"id","ids","include","exclude","orderby","order");i=wp.media.query(e);i.gallery=new Backbone.Model(g);return i},shortcode:function(d){var f=d.props.toJSON(),e=_.pick(f,"orderby","order"),g,h;if(d.gallery){_.extend(e,d.gallery.toJSON())}e.ids=d.pluck("id");if(f.uploadedTo){e.id=f.uploadedTo}if(e._orderbyRandom){e.orderby="rand"}delete e._orderbyRandom;if(e.ids&&"post__in"===e.orderby){delete e.orderby}_.each(wp.media.gallery.defaults,function(j,i){if(j===e[i]){delete e[i]}});g=new wp.shortcode({tag:"gallery",attrs:e,type:"single"});h=new wp.media.model.Attachments(d.models,{props:f});h.gallery=d.gallery;c[g.string()]=h;return g},edit:function(g){var f=wp.shortcode.next("gallery",g),h=wp.media.gallery.defaults.id,d,e;if(!f||f.content!==g){return}f=f.shortcode;if(_.isUndefined(f.get("id"))&&!_.isUndefined(h)){f.set("id",h)}d=wp.media.gallery.attachments(f);e=new wp.media.model.Selection(d.models,{props:d.props.toJSON(),multiple:true});e.gallery=d.gallery;e.more().done(function(){e.props.set({query:false});e.unmirror();e.props.unset("orderby")});if(this.frame){this.frame.dispose()}this.frame=wp.media({frame:"post",state:"gallery-edit",title:wp.media.view.l10n.editGalleryTitle,editing:true,multiple:true,selection:e}).open();return this.frame}}}());wp.media.featuredImage={get:function(){return wp.media.view.settings.post.featuredImageId},set:function(d){var c=wp.media.view.settings;c.post.featuredImageId=d;wp.media.post("set-post-thumbnail",{json:true,post_id:c.post.id,thumbnail_id:c.post.featuredImageId,_wpnonce:c.post.nonce}).done(function(e){b(".inside","#postimagediv").html(e)})},frame:function(){if(this._frame){return this._frame}this._frame=wp.media({state:"featured-image",states:[new wp.media.controller.FeaturedImage()]});this._frame.on("toolbar:create:featured-image",function(c){this.createSelectToolbar(c,{text:wp.media.view.l10n.setFeaturedImage})},this._frame);this._frame.state("featured-image").on("select",this.select);return this._frame},select:function(){var d=wp.media.view.settings,c=this.get("selection").single();if(!d.post.featuredImageId){return}wp.media.featuredImage.set(c?c.id:-1)},init:function(){b("#postimagediv").on("click","#set-post-thumbnail",function(c){c.preventDefault();c.stopPropagation();wp.media.featuredImage.frame().open()}).on("click","#remove-post-thumbnail",function(){wp.media.view.settings.post.featuredImageId=-1})}};b(wp.media.featuredImage.init);wp.media.editor={insert:function(g){var d=typeof(tinymce)!="undefined",j=typeof(QTags)!="undefined",c=window.wpActiveEditor,f;if(window.send_to_editor){return window.send_to_editor.apply(this,arguments)}if(!c){if(d&&tinymce.activeEditor){f=tinymce.activeEditor;c=window.wpActiveEditor=f.id}else{if(!j){return false}}}else{if(d){if(tinymce.activeEditor&&(tinymce.activeEditor.id=="mce_fullscreen"||tinymce.activeEditor.id=="wp_mce_fullscreen")){f=tinymce.activeEditor}else{f=tinymce.get(c)}}}if(f&&!f.isHidden()){if(tinymce.isIE&&f.windowManager.insertimagebookmark){f.selection.moveToBookmark(f.windowManager.insertimagebookmark)}if(g.indexOf("[caption")!==-1){if(f.wpSetImgCaption){g=f.wpSetImgCaption(g)}}else{if(g.indexOf("[gallery")!==-1){if(f.plugins.wpgallery){g=f.plugins.wpgallery._do_gallery(g)}}else{if(g.indexOf("[embed")===0){if(f.plugins.wordpress){g=f.plugins.wordpress._setEmbed(g)}}}}f.execCommand("mceInsertContent",false,g)}else{if(j){QTags.insertContent(g)}else{document.getElementById(c).value+=g}}if(window.tb_remove){try{window.tb_remove()}catch(i){}}},add:function(e,c){var d=this.get(e);if(d){return d}d=a[e]=wp.media(_.defaults(c||{},{frame:"post",state:"insert",title:wp.media.view.l10n.addMedia,multiple:true}));d.on("insert",function(f){var g=d.state();f=f||g.get("selection");if(!f){return}b.when.apply(b,f.map(function(i){var h=g.display(i).toJSON();return this.send.attachment(h,i.toJSON())},this)).done(function(){wp.media.editor.insert(_.toArray(arguments).join("\n\n"))})},this);d.state("gallery-edit").on("update",function(f){this.insert(wp.media.gallery.shortcode(f).string())},this);d.state("embed").on("select",function(){var g=d.state(),f=g.get("type"),h=g.props.toJSON();h.url=h.url||"";if("link"===f){_.defaults(h,{title:h.url,linkUrl:h.url});this.send.link(h).done(function(i){wp.media.editor.insert(i)})}else{if("image"===f){_.defaults(h,{title:h.url,linkUrl:"",align:"none",link:"none"});if("none"===h.link){h.linkUrl=""}else{if("file"===h.link){h.linkUrl=h.url}}this.insert(wp.media.string.image(h))}}},this);d.state("featured-image").on("select",wp.media.featuredImage.select);d.setState(d.options.state);return d},id:function(c){if(c){return c}c=wpActiveEditor;if(!c&&typeof tinymce!=="undefined"&&tinymce.activeEditor){c=tinymce.activeEditor.id}c=c||"";return c},get:function(c){c=this.id(c);return a[c]},remove:function(c){c=this.id(c);delete a[c]},send:{attachment:function(f,g){var c=g.caption,d,e;if(!wp.media.view.settings.captions){delete g.caption}f=wp.media.string.props(f,g);d={id:g.id,post_content:g.description,post_excerpt:c};if(f.linkUrl){d.url=f.linkUrl}if("image"===g.type){e=wp.media.string.image(f);_.each({align:"align",size:"image-size",alt:"image_alt"},function(h,i){if(f[i]){d[h]=f[i]}})}else{if("video"===g.type){e=wp.media.string.video(f,g)}else{if("audio"===g.type){e=wp.media.string.audio(f,g)}else{e=wp.media.string.link(f);d.post_title=f.title}}}return wp.media.post("send-attachment-to-editor",{nonce:wp.media.view.settings.nonce.sendToEditor,attachment:d,html:e,post_id:wp.media.view.settings.post.id})},link:function(c){return wp.media.post("send-link-to-editor",{nonce:wp.media.view.settings.nonce.sendToEditor,src:c.linkUrl,title:c.title,html:wp.media.string.link(c),post_id:wp.media.view.settings.post.id})}},open:function(e){var d,c;e=this.id(e);if(typeof tinymce!=="undefined"){c=tinymce.get(e);if(tinymce.isIE&&c&&!c.isHidden()){c.focus();c.windowManager.insertimagebookmark=c.selection.getBookmark()}}d=this.get(e);if(!d){d=this.add(e)}return d.open()},init:function(){b(document.body).on("click",".insert-media",function(d){var e=b(this),c=e.data("editor");d.preventDefault();e.blur();wp.media.editor.open(c)})}};_.bindAll(wp.media.editor,"open");b(wp.media.editor.init)}(jQuery));
\ No newline at end of file
+(function(b){var a={};wp.media.string={props:function(f,i){var h,c,e,g,d,j=wp.media.view.settings.defaultProps;d=function(k){if("image"===k.type&&!k.alt){k.alt=k.caption||k.title||"";k.alt=k.alt.replace(/<\/?[^>]+>/g,"");k.alt=k.alt.replace(/[\r\n]+/g," ")}return k};f=f?_.clone(f):{};if(i&&i.type){f.type=i.type}if("image"===f.type){f=_.defaults(f||{},{align:j.align||getUserSetting("align","none"),size:j.size||getUserSetting("imgsize","medium"),url:"",classes:[]})}if(!i){return d(f)}f.title=f.title||i.title;h=f.link||j.link||getUserSetting("urlbutton","file");if("file"===h){c=i.url}else{if("post"===h){c=i.link}else{if("custom"===h){c=f.linkUrl}}}f.linkUrl=c||"";if("image"===i.type){f.classes.push("wp-image-"+i.id);g=i.sizes;e=g&&g[f.size]?g[f.size]:i;_.extend(f,_.pick(i,"align","caption","alt"),{width:e.width,height:e.height,src:e.url,captionId:"attachment_"+i.id})}else{if("video"===i.type||"audio"===i.type){_.extend(f,_.pick(i,"title","type","icon","mime"))}else{f.title=f.title||i.filename;f.rel=f.rel||"attachment wp-att-"+i.id}}return d(f)},link:function(d,e){var c;d=wp.media.string.props(d,e);c={tag:"a",content:d.title,attrs:{href:d.linkUrl}};if(d.rel){c.attrs.rel=d.rel}return wp.html.string(c)},audio:function(d,f){var e,c;d=wp.media.string.props(d,f);e={};if(d.mime){switch(d.mime){case"audio/mpeg":if(f.url.indexOf("mp3")){e.mp3=f.url}else{if(f.url.indexOf("m4a")){e.m4a=f.url}}break;case"audio/mp3":e.mp3=f.url;break;case"audio/m4a":e.m4a=f.url;break;case"audio/wav":e.wav=f.url;break;case"audio/ogg":e.ogg=f.url;break;case"audio/x-ms-wma":case"audio/wma":e.wma=f.url;break}}c=wp.shortcode.string({tag:"audio",attrs:e});return c},video:function(d,f){var e,c;d=wp.media.string.props(d,f);e={};if(f.width){e.width=f.width}if(f.height){e.height=f.height}if(d.mime){switch(d.mime){case"video/mp4":e.mp4=f.url;break;case"video/m4v":e.m4v=f.url;break;case"video/webm":e.webm=f.url;break;case"video/ogg":e.ogv=f.url;break;case"video/x-ms-wmv":case"video/wmv":case"video/asf":e.wmv=f.url;break;case"video/flv":case"video/x-flv":e.flv=f.url;break}}c=wp.shortcode.string({tag:"video",attrs:e});return c},image:function(g,i){var c={},d,f,h,e;g=wp.media.string.props(g,i);f=g.classes||[];c.src=typeof i!=="undefined"?i.url:g.url;_.extend(c,_.pick(g,"width","height","alt"));if(g.align&&!g.caption){f.push("align"+g.align)}if(g.size){f.push("size-"+g.size)}c["class"]=_.compact(f).join(" ");d={tag:"img",attrs:c,single:true};if(g.linkUrl){d={tag:"a",attrs:{href:g.linkUrl},content:d}}e=wp.html.string(d);if(g.caption){h={};if(c.width){h.width=c.width}if(g.captionId){h.id=g.captionId}if(g.align){h.align="align"+g.align}e=wp.shortcode.string({tag:"caption",attrs:h,content:e+" "+g.caption})}return e}};wp.media.gallery=(function(){var c={};return{defaults:{order:"ASC",id:wp.media.view.settings.post.id,itemtag:"dl",icontag:"dt",captiontag:"dd",columns:"3",size:"thumbnail",orderby:"menu_order ID"},attachments:function(h){var j=h.string(),d=c[j],f,e,i,g;delete c[j];if(d){return d}f=_.defaults(h.attrs.named,wp.media.gallery.defaults);e=_.pick(f,"orderby","order");e.type="image";e.perPage=-1;if("rand"===f.orderby){f._orderbyRandom=true}if(!f.orderby||/^menu_order(?: ID)?$/i.test(f.orderby)){e.orderby="menuOrder"}if(f.ids){e.post__in=f.ids.split(",");e.orderby="post__in"}else{if(f.include){e.post__in=f.include.split(",")}}if(f.exclude){e.post__not_in=f.exclude.split(",")}if(!e.post__in){e.uploadedTo=f.id}g=_.omit(f,"id","ids","include","exclude","orderby","order");i=wp.media.query(e);i.gallery=new Backbone.Model(g);return i},shortcode:function(d){var f=d.props.toJSON(),e=_.pick(f,"orderby","order"),g,h;if(d.gallery){_.extend(e,d.gallery.toJSON())}e.ids=d.pluck("id");if(f.uploadedTo){e.id=f.uploadedTo}if(e._orderbyRandom){e.orderby="rand"}delete e._orderbyRandom;if(e.ids&&"post__in"===e.orderby){delete e.orderby}_.each(wp.media.gallery.defaults,function(j,i){if(j===e[i]){delete e[i]}});g=new wp.shortcode({tag:"gallery",attrs:e,type:"single"});h=new wp.media.model.Attachments(d.models,{props:f});h.gallery=d.gallery;c[g.string()]=h;return g},edit:function(g){var f=wp.shortcode.next("gallery",g),h=wp.media.gallery.defaults.id,d,e;if(!f||f.content!==g){return}f=f.shortcode;if(_.isUndefined(f.get("id"))&&!_.isUndefined(h)){f.set("id",h)}d=wp.media.gallery.attachments(f);e=new wp.media.model.Selection(d.models,{props:d.props.toJSON(),multiple:true});e.gallery=d.gallery;e.more().done(function(){e.props.set({query:false});e.unmirror();e.props.unset("orderby")});if(this.frame){this.frame.dispose()}this.frame=wp.media({frame:"post",state:"gallery-edit",title:wp.media.view.l10n.editGalleryTitle,editing:true,multiple:true,selection:e}).open();return this.frame}}}());wp.media.featuredImage={get:function(){return wp.media.view.settings.post.featuredImageId},set:function(d){var c=wp.media.view.settings;c.post.featuredImageId=d;wp.media.post("set-post-thumbnail",{json:true,post_id:c.post.id,thumbnail_id:c.post.featuredImageId,_wpnonce:c.post.nonce}).done(function(e){b(".inside","#postimagediv").html(e)})},frame:function(){if(this._frame){return this._frame}this._frame=wp.media({state:"featured-image",states:[new wp.media.controller.FeaturedImage()]});this._frame.on("toolbar:create:featured-image",function(c){this.createSelectToolbar(c,{text:wp.media.view.l10n.setFeaturedImage})},this._frame);this._frame.state("featured-image").on("select",this.select);return this._frame},select:function(){var d=wp.media.view.settings,c=this.get("selection").single();if(!d.post.featuredImageId){return}wp.media.featuredImage.set(c?c.id:-1)},init:function(){b("#postimagediv").on("click","#set-post-thumbnail",function(c){c.preventDefault();c.stopPropagation();wp.media.featuredImage.frame().open()}).on("click","#remove-post-thumbnail",function(){wp.media.view.settings.post.featuredImageId=-1})}};b(wp.media.featuredImage.init);wp.media.editor={insert:function(g){var d=typeof(tinymce)!="undefined",j=typeof(QTags)!="undefined",c=window.wpActiveEditor,f;if(window.send_to_editor){return window.send_to_editor.apply(this,arguments)}if(!c){if(d&&tinymce.activeEditor){f=tinymce.activeEditor;c=window.wpActiveEditor=f.id}else{if(!j){return false}}}else{if(d){if(tinymce.activeEditor&&(tinymce.activeEditor.id=="mce_fullscreen"||tinymce.activeEditor.id=="wp_mce_fullscreen")){f=tinymce.activeEditor}else{f=tinymce.get(c)}}}if(f&&!f.isHidden()){if(tinymce.isIE&&f.windowManager.insertimagebookmark){f.selection.moveToBookmark(f.windowManager.insertimagebookmark)}if(g.indexOf("[caption")!==-1){if(f.wpSetImgCaption){g=f.wpSetImgCaption(g)}}else{if(g.indexOf("[gallery")!==-1){if(f.plugins.wpgallery){g=f.plugins.wpgallery._do_gallery(g)}}else{if(g.indexOf("[embed")===0){if(f.plugins.wordpress){g=f.plugins.wordpress._setEmbed(g)}}}}f.execCommand("mceInsertContent",false,g)}else{if(j){QTags.insertContent(g)}else{document.getElementById(c).value+=g}}if(window.tb_remove){try{window.tb_remove()}catch(i){}}},add:function(e,c){var d=this.get(e);d=a[e]=wp.media(_.defaults(c||{},{frame:"post",state:"insert",title:wp.media.view.l10n.addMedia,multiple:true}));d.on("insert",function(f){var g=d.state();f=f||g.get("selection");if(!f){return}b.when.apply(b,f.map(function(i){var h=g.display(i).toJSON();return this.send.attachment(h,i.toJSON())},this)).done(function(){wp.media.editor.insert(_.toArray(arguments).join("\n\n"))})},this);d.state("gallery-edit").on("update",function(f){this.insert(wp.media.gallery.shortcode(f).string())},this);d.state("embed").on("select",function(){var g=d.state(),f=g.get("type"),h=g.props.toJSON();h.url=h.url||"";if("link"===f){_.defaults(h,{title:h.url,linkUrl:h.url});this.send.link(h).done(function(i){wp.media.editor.insert(i)})}else{if("image"===f){_.defaults(h,{title:h.url,linkUrl:"",align:"none",link:"none"});if("none"===h.link){h.linkUrl=""}else{if("file"===h.link){h.linkUrl=h.url}}this.insert(wp.media.string.image(h))}}},this);d.state("featured-image").on("select",wp.media.featuredImage.select);d.setState(d.options.state);return d},id:function(c){if(c){return c}c=wpActiveEditor;if(!c&&typeof tinymce!=="undefined"&&tinymce.activeEditor){c=tinymce.activeEditor.id}c=c||"";return c},get:function(c){c=this.id(c);return a[c]},remove:function(c){c=this.id(c);delete a[c]},send:{attachment:function(f,g){var c=g.caption,d,e;if(!wp.media.view.settings.captions){delete g.caption}f=wp.media.string.props(f,g);d={id:g.id,post_content:g.description,post_excerpt:c};if(f.linkUrl){d.url=f.linkUrl}if("image"===g.type){e=wp.media.string.image(f);_.each({align:"align",size:"image-size",alt:"image_alt"},function(h,i){if(f[i]){d[h]=f[i]}})}else{if("video"===g.type){e=wp.media.string.video(f,g)}else{if("audio"===g.type){e=wp.media.string.audio(f,g)}else{e=wp.media.string.link(f);d.post_title=f.title}}}return wp.media.post("send-attachment-to-editor",{nonce:wp.media.view.settings.nonce.sendToEditor,attachment:d,html:e,post_id:wp.media.view.settings.post.id})},link:function(c){return wp.media.post("send-link-to-editor",{nonce:wp.media.view.settings.nonce.sendToEditor,src:c.linkUrl,title:c.title,html:wp.media.string.link(c),post_id:wp.media.view.settings.post.id})}},open:function(f,c){var e,d;c=c||{};f=this.id(f);if(typeof tinymce!=="undefined"){d=tinymce.get(f);if(tinymce.isIE&&d&&!d.isHidden()){d.focus();d.windowManager.insertimagebookmark=d.selection.getBookmark()}}e=this.get(f);if(!e||(e.options&&c.state!==e.options.state)){e=this.add(f,c)}return e.open()},init:function(){b(document.body).on("click",".insert-media",function(e){var f=b(this),d=f.data("editor"),c={frame:"post",state:"insert",title:wp.media.view.l10n.addMedia,multiple:true};e.preventDefault();f.blur();if(f.hasClass("gallery")){c.state="gallery";c.title=wp.media.view.l10n.createGalleryTitle}wp.media.editor.open(d,c)})}};_.bindAll(wp.media.editor,"open");b(wp.media.editor.init)}(jQuery));
\ No newline at end of file
diff --git a/wp-includes/version.php b/wp-includes/version.php
index aa6608ee80..a8c71edc2b 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '3.6-beta1-24086';
+$wp_version = '3.6-beta1-24090';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.