Merge remote-tracking branch 'origin/stable'

# Conflicts:
#	Dockerfile
#	package-lock.json
#	package.json
#	src/services/cloning.js

test-etapi/put-note-content-binary.http

@@ -0,0 +1,25 @@
+POST {{triliumHost}}/etapi/create-note
+Authorization: {{authToken}}
+Content-Type: application/json
+
+{
+  "parentNoteId": "root",
+  "title": "Hello",
+  "type": "image",
+  "mime": "image/png",
+  "content": ""
+}
+
+> {% client.global.set("createdNoteId", response.body.note.noteId); %}
+
+###
+
+PUT {{triliumHost}}/etapi/notes/{{createdNoteId}}/content
+Authorization: {{authToken}}
+Content-Type: application/octet-stream
+Content-Transfer-Encoding: binary
+
+< ../images/icon-color.png
+
+> {% client.assert(response.status === 204); %}
+

test-etapi/put-note-content.http

@@ -20,6 +20,8 @@ Content-Type: text/plain
 
 Changed content
 
+> {% client.assert(response.status === 200); %}
+
 ###
 
 GET {{triliumHost}}/etapi/notes/{{createdNoteId}}/content