Branching

Merged Martijn Vermaat requested to merge branching into master

I hope you accept these changes (or we have no slides ;))

Merge request reports