Merge remote-tracking branch 'origin/master' into 2.0.X

# Conflicts:
#	docker/debian-base.dockerfile
#	package-lock.json
#	package.json
#	server/database.js
#	src/router.js

server/jobs/clear-old-data.js

@@ -42,6 +42,8 @@ const clearOldData = async () => {
                 "DELETE FROM heartbeat WHERE time < " + sqlHourOffset,
                 [ parsedPeriod * -24 ]
             );
+
+            await R.exec("PRAGMA optimize;");
         } catch (e) {
             log.error("clearOldData", `Failed to clear old data: ${e.message}`);
         }