Merge branch 'log-dialog' into format-titles