After the Deadline: Merge changes from wpcom

Merges r95179-wpcom (better escaping).
Merges r97562-wpcom (change to option message).