Merge commit 'remotes/jmtd/friendly_markup_names'