This change has been made in both branches so will most likely conflict. I'd recommend removing it from this branch.