r: New branch
Merge branch 'master' of https://github.com/cznic/tmp
s: WIP snapshot
s: WIP snapshot