FIX: Removing -i from rebase, is useless for us
Merge branch 'fix-rebase-code-our-gitflow'

* fix-rebase-code-our-gitflow:
  FIX: Removing -i from rebase, is useless for us