Merging in mis-named branch

I know… I know… it was a stupid name in the first place.