goto next 2.15-dev from Darron
apply Darron's cleanup