Merge branch 'jk/rerere-xsnprintf'