Merge OAuth, upgrade Drone.