Test rebase and git on linux
Merge branch 'rebasetest'