Merge commit '08ebfc2a0bc34e45174c090e8dff098f92028184' into palma-branch
Merge branch 'palma-branch'
Merge branch 'master' of https://github.com/bkummel/git-playground
Merge branch 'master' of https://github.com/bkummel/git-playground