Merge back our changes to master