master 16
Merge branch 'master' of github.com:jaleszek/rebase-fun into 3