Another master merged into the zoom branches
This is a merge done on a separate branch. It could/almost certainly will lead to a branching point mismatch when comparing against master but will mean any merge done on an unprotected zoom_merge won't change any code (in theory).