Merge develop into master to change branching model

We're switching branching model and merging develop into master before removing develop once and for all.