fast-forwarding master to auto = 47b8479e