Merge branch 'mjog/579-logging-deadlock' into 'gnome-3-34'
Fix deadlock when finalising log records generates more logging
Closes #579 (closed)
See merge request !320 (merged)
(cherry picked from commit cef0aeee)
e5b23946 Fix deadlock when finalising log records generates more logging