Merge branch 'master' into es6-integration

public/js/index.js

@@ -3452,6 +3452,7 @@ function updateViewInner() {
     var value = editor.getValue();
     var lastMeta = md.meta;
     md.meta = {};
+    delete md.metaError;
     var rendered = md.render(value);
     if (md.meta.type && md.meta.type === 'slide') {
         var slideOptions = {

public/js/pretty.js

@@ -24,6 +24,7 @@ const markdown = $("#doc.markdown-body");
 const text = markdown.text();
 const lastMeta = md.meta;
 md.meta = {};
+delete md.metaError;
 let rendered = md.render(text);
 if (md.meta.type && md.meta.type === 'slide') {
     const slideOptions = {