Manually merged my changes with Kevin's