diff --git a/.jsduck/eg-iframe.html b/.jsduck/eg-iframe.html
index fb475d67c4..f23a43daa7 100644
--- a/.jsduck/eg-iframe.html
+++ b/.jsduck/eg-iframe.html
@@ -45,6 +45,7 @@
 		<link rel=stylesheet href="lib/ve/src/ui/styles/contextitems/ve.ui.LanguageContextItem.css" class="stylesheet-ve">
 		<link rel=stylesheet href="lib/ve/src/ui/styles/contextitems/ve.ui.LinkContextItem.css" class="stylesheet-ve">
 		<link rel=stylesheet href="lib/ve/src/ui/styles/contextitems/ve.ui.ToolContextItem.css" class="stylesheet-ve">
+		<link rel=stylesheet href="lib/ve/src/ui/styles/contextitems/ve.ui.TableContextItem.css" class="stylesheet-ve">
 		<link rel=stylesheet href="lib/ve/src/ui/styles/ve.ui.Overlay.css" class="stylesheet-ve">
 		<link rel=stylesheet href="lib/ve/src/ui/styles/ve.ui.Surface.css" class="stylesheet-ve">
 		<link rel=stylesheet href="lib/ve/src/ui/styles/widgets/ve.ui.SurfaceWidget.css" class="stylesheet-ve">
@@ -304,6 +305,7 @@
 		<script src="lib/ve/src/ui/ve.ui.Overlay.js"></script>
 		<script src="lib/ve/src/ui/ve.ui.Surface.js"></script>
 		<script src="lib/ve/src/ui/ve.ui.Context.js"></script>
+		<script src="lib/ve/src/ui/ve.ui.LinearContext.js"></script>
 		<script src="lib/ve/src/ui/ve.ui.ModeledFactory.js"></script>
 		<script src="lib/ve/src/ui/ve.ui.ContextItem.js"></script>
 		<script src="lib/ve/src/ui/ve.ui.ContextItemFactory.js"></script>
@@ -312,6 +314,7 @@
 		<script src="lib/ve/src/ui/contextitems/ve.ui.LanguageContextItem.js"></script>
 		<script src="lib/ve/src/ui/contextitems/ve.ui.LinkContextItem.js"></script>
 		<script src="lib/ve/src/ui/contextitems/ve.ui.ToolContextItem.js"></script>
+		<script src="lib/ve/src/ui/contextitems/ve.ui.TableContextItem.js"></script>
 		<script src="lib/ve/src/ui/ve.ui.TableContext.js"></script>
 		<script src="lib/ve/src/ui/ve.ui.Tool.js"></script>
 		<script src="lib/ve/src/ui/ve.ui.Toolbar.js"></script>
diff --git a/VisualEditor.php b/VisualEditor.php
index d412225858..a87745c346 100644
--- a/VisualEditor.php
+++ b/VisualEditor.php
@@ -546,6 +546,7 @@ $wgResourceModules += array(
 			'lib/ve/src/ui/ve.ui.Overlay.js',
 			'lib/ve/src/ui/ve.ui.Surface.js',
 			'lib/ve/src/ui/ve.ui.Context.js',
+			'lib/ve/src/ui/ve.ui.LinearContext.js',
 			'lib/ve/src/ui/ve.ui.ModeledFactory.js',
 			'lib/ve/src/ui/ve.ui.ContextItem.js',
 			'lib/ve/src/ui/ve.ui.ContextItemFactory.js',
@@ -583,6 +584,7 @@ $wgResourceModules += array(
 			'lib/ve/src/ui/contextitems/ve.ui.LanguageContextItem.js',
 			'lib/ve/src/ui/contextitems/ve.ui.LinkContextItem.js',
 			'lib/ve/src/ui/contextitems/ve.ui.ToolContextItem.js',
+			'lib/ve/src/ui/contextitems/ve.ui.TableContextItem.js',
 
 			'lib/ve/src/ui/commands/ve.ui.ClearAnnotationCommand.js',
 			'lib/ve/src/ui/commands/ve.ui.HistoryCommand.js',
@@ -674,6 +676,7 @@ $wgResourceModules += array(
 			'lib/ve/src/ui/styles/contextitems/ve.ui.LanguageContextItem.css',
 			'lib/ve/src/ui/styles/contextitems/ve.ui.LinkContextItem.css',
 			'lib/ve/src/ui/styles/contextitems/ve.ui.ToolContextItem.css',
+			'lib/ve/src/ui/styles/contextitems/ve.ui.TableContextItem.css',
 			'lib/ve/src/ui/styles/ve.ui.Overlay.css',
 			'lib/ve/src/ui/styles/ve.ui.Surface.css',
 			'lib/ve/src/ui/styles/ve.ui.Toolbar.css',
diff --git a/extension.json b/extension.json
index 1cdc52d970..9e480eee4d 100644
--- a/extension.json
+++ b/extension.json
@@ -611,6 +611,7 @@
 				"lib/ve/src/ui/ve.ui.Overlay.js",
 				"lib/ve/src/ui/ve.ui.Surface.js",
 				"lib/ve/src/ui/ve.ui.Context.js",
+				"lib/ve/src/ui/ve.ui.LinearContext.js",
 				"lib/ve/src/ui/ve.ui.ModeledFactory.js",
 				"lib/ve/src/ui/ve.ui.ContextItem.js",
 				"lib/ve/src/ui/ve.ui.ContextItemFactory.js",
@@ -646,6 +647,7 @@
 				"lib/ve/src/ui/contextitems/ve.ui.LanguageContextItem.js",
 				"lib/ve/src/ui/contextitems/ve.ui.LinkContextItem.js",
 				"lib/ve/src/ui/contextitems/ve.ui.ToolContextItem.js",
+				"lib/ve/src/ui/contextitems/ve.ui.TableContextItem.js",
 				"lib/ve/src/ui/commands/ve.ui.ClearAnnotationCommand.js",
 				"lib/ve/src/ui/commands/ve.ui.HistoryCommand.js",
 				"lib/ve/src/ui/commands/ve.ui.IndentationCommand.js",
@@ -726,6 +728,7 @@
 				"lib/ve/src/ui/styles/contextitems/ve.ui.LanguageContextItem.css",
 				"lib/ve/src/ui/styles/contextitems/ve.ui.LinkContextItem.css",
 				"lib/ve/src/ui/styles/contextitems/ve.ui.ToolContextItem.css",
+				"lib/ve/src/ui/styles/contextitems/ve.ui.TableContextItem.css",
 				"lib/ve/src/ui/styles/ve.ui.Overlay.css",
 				"lib/ve/src/ui/styles/ve.ui.Surface.css",
 				"lib/ve/src/ui/styles/ve.ui.Toolbar.css",
diff --git a/lib/ve b/lib/ve
index 2714bfc0c7..795aab5f65 160000
--- a/lib/ve
+++ b/lib/ve
@@ -1 +1 @@
-Subproject commit 2714bfc0c748844033d147b04a2c8d7c670e9df9
+Subproject commit 795aab5f65f05dafd1a8bddd7ccb476070674464