b.1
m.3
Merge b1

Merge branch 'master' of github.com:magnusfeuer/rebase_test