Playing with commits
Merge branch 'master' of github.com:cgrandin/test