Fix broken merge from master