Index: wp-includes/js/tinymce/wp-tinymce-schema.js
===================================================================
--- wp-includes/js/tinymce/wp-tinymce-schema.js	(revision 23147)
+++ wp-includes/js/tinymce/wp-tinymce-schema.js	(working copy)
@@ -59,7 +59,7 @@
 		if (!html5) {
 			html5 = mapCache.html5 = unpack({
 					A : 'id|accesskey|class|dir|draggable|item|hidden|itemprop|role|spellcheck|style|subject|title|onclick|ondblclick|onmousedown|onmouseup|onmouseover|onmousemove|onmouseout|onkeypress|onkeydown|onkeyup|lang|xml:lang|dir',
-					B : '#|a|abbr|area|audio|b|bdo|br|button|canvas|cite|code|command|datalist|del|dfn|em|embed|i|iframe|img|input|ins|kbd|keygen|label|link|map|mark|meta|' +
+					B : '#|a|abbr|area|audio|b|bdi|bdo|br|button|canvas|cite|code|command|data|datalist|del|dfn|em|embed|i|iframe|img|input|ins|kbd|keygen|label|link|map|mark|meta|' +
 						'meter|noscript|object|output|progress|q|ruby|samp|script|select|small|span|strong|sub|sup|svg|textarea|time|var|video|wbr|acronym|basefont|font|big|strike|s|u|tt|applet',
 					C : '#|a|abbr|area|address|article|aside|audio|b|bdo|blockquote|br|button|canvas|cite|code|command|datalist|del|details|dfn|dialog|div|dl|em|embed|fieldset|' +
 						'figure|footer|form|h1|h2|h3|h4|h5|h6|header|hgroup|hr|i|iframe|img|input|ins|kbd|keygen|label|link|map|mark|menu|meta|meter|nav|noscript|ol|object|output|' +
@@ -122,6 +122,7 @@
 					'ruby[A][B|rt|rp]' +
 					'rt[A][B]' +
 					'rp[A][B]' +
+					'bdi[A][B]' +
 					'bdo[A][B]' +
 					'span[A][B]' +
 					'ins[A|cite|datetime][C]' +
@@ -131,16 +132,18 @@
 					'img[A|alt|src|height|width|usemap|ismap|name|longdesc|align|border|hspace|vspace][]' +
 					'iframe[A|name|src|height|width|sandbox|seamless|longdesc|frameborder|marginwidth|marginheight|scrolling|align][]' +
 					'embed[A|src|height|width|type][]' +
-					'object[*][]' +
+					'object[*][C]' +
 					'param[A|name|value|valuetype|type][]' +
-					'details[A|open][C|legend]' +
-					'command[A|type|label|icon|disabled|checked|radiogroup][]' +
+					'summary[A][B]' +
+					'details[A|open][C|legend|summary]' +
+					'command[A|type|label|icon|disabled|checked|radiogroup|command][]' +
 					'menu[A|type|label|compact][C|li]' +
 					'legend[A|align][C|B]' +
 					'div[A|align][C]' +
 					'source[A|src|type|media][]' +
-					'audio[A|src|autobuffer|autoplay|loop|controls][source]' +
-					'video[A|src|autobuffer|autoplay|loop|controls|width|height|poster][source]' +
+					'track[A|kind|src|srclang|label|default][]' +
+					'audio[A|src|autobuffer|autoplay|loop|controls|crossorigin|preload|mediagroup|muted][C|source|track]' +
+					'video[A|src|autobuffer|autoplay|loop|controls|width|height|poster|crossorigin|preload|mediagroup|muted][C|source|track]' +
 					'hr[A|align|noshade|size|width][]' +
 					'form[A|accept-charset|action|autocomplete|enctype|method|name|novalidate|target|onsubmit|onreset|accept][C]' +
 					'fieldset[A|disabled|form|name][C|legend]' +
@@ -149,13 +152,14 @@
 						'multiple|pattern|placeholder|readonly|required|size|src|step|width|files|value|name|tabindex|onfocus|onblur|usemap|onselect|onchange|align][]' +
 					'button[A|autofocus|disabled|form|formaction|formenctype|formmethod|formnovalidate|formtarget|name|value|type|tabindex|onfocus|onblur][B]' +
 					'select[A|autofocus|disabled|form|multiple|name|size|tabindex|onfocus|onblur|onchange][option|optgroup]' +
+					'data[A|value][B]' +
 					'datalist[A][B|option]' +
 					'optgroup[A|disabled|label][option]' +
 					'option[A|disabled|selected|label|value][]' +
 					'textarea[A|autofocus|disabled|form|maxlength|name|placeholder|readonly|required|rows|cols|wrap|tabindex|onfocus|onblur|onselect|onchange][]' +
 					'keygen[A|autofocus|challenge|disabled|form|keytype|name][]' +
 					'output[A|for|form|name][B]' +
-					'canvas[A|width|height][]' +
+					'canvas[A|width|height][a|button|input]' +
 					'map[A|name][B|C]' +
 					'area[A|shape|coords|href|alt|target|media|rel|ping|type|tabindex|onfocus|onblur|nohref][]' +
 					'mathml[A][]' +
Index: wp-includes/js/tinymce/plugins/wordpress/editor_plugin_src.js
===================================================================
--- wp-includes/js/tinymce/plugins/wordpress/editor_plugin_src.js	(revision 23147)
+++ wp-includes/js/tinymce/plugins/wordpress/editor_plugin_src.js	(working copy)
@@ -135,12 +135,6 @@
 				}
 			});
 
-			// Extend <object> and <embed> (#WP22790)
-			ed.onPreInit.add(function(ed) {
-				ed.schema.addValidElements('object[*],param[id|name|value|valuetype|type],embed[*]');
-				ed.schema.addValidChildren('+object[embed]');
-			});
-
 			ed.onInit.add(function(ed) {
 				var bodyClass = ed.getParam('body_class', ''), body = ed.getBody();