back-merge master to branch (prep for final merge)