cleanup
Merge branch 'master' of https://github.com/jbadeau/Bundle.git
rebase