Merge branch 'markup-some-printk-like-functions'