Restored dropped changes from master.