AtD: Pinking shears

Merges r94309-wpcom.