Merge Tuesdays changes into the Master.