merging in a bunch of changes from the private repo of sprocket