The nightlyParts branch was already partly merged to master, which caused a conflict that prevented it to directly rebase it on master.
I manually cleaned up the history of nightlyParts, to resolve the conflicts, and created a new branch 'develop'. Head of develop ba2f3b7 and nightlyParts should be identical cd919aab at the moment of this PR, just the history is cleaned up.
Following git flow, 'develop' will also be the new default branch for pull requests.
The nightlyParts branch was already partly merged to master, which caused a conflict that prevented it to directly rebase it on master. I manually cleaned up the history of nightlyParts, to resolve the conflicts, and created a new branch 'develop'. Head of develop ba2f3b7 and nightlyParts should be identical cd919aab at the moment of this PR, just the history is cleaned up.
Following git flow, 'develop' will also be the new default branch for pull requests.