Merging in the changes from Master Git