Merge branch 'master' into next61

# Conflicts:
#	package-lock.json
#	src/public/app/services/note_content_renderer.js
#	src/public/app/widgets/note_tree.js
#	src/routes/routes.js
#	src/services/consistency_checks.js
#	src/services/notes.js
#	src/services/task_context.js

src/routes/api/sql.js

@@ -28,6 +28,12 @@ function execute(req) {
         for (let query of queries) {
             query = query.trim();
 
+            while (query.startsWith('-- ')) {
+                // Query starts with one or more SQL comments, discard these before we execute.
+                const pivot = query.indexOf('\n');
+                query = pivot > 0 ? query.substr(pivot + 1).trim() : "";
+            }
+            
             if (!query) {
                 continue;
             }