Merge the merge, back on master