Merged, and we fixed the too-many-pink bug.