Applying shoestrap customizations (dummy commit, finishing off the merge)