Merge remote-tracking branch 'origin/stable'

# Conflicts:
#	db/demo.zip
#	src/services/notes.js
#	src/services/request.js

src/public/app/widgets/note_detail.js

@@ -329,4 +329,9 @@ export default class NoteDetailWidget extends TabAwareWidget {
             saveSelection: true
         });
     }
+
+    // used by cutToNote in CKEditor build
+    async saveNoteDetailNowCommand() {
+        await this.spacedUpdate.updateNowIfNecessary();
+    }
 }