Fix so Mail link in Wilkinson footer does not interfere with Email This link
Merge branch '2013.04.0' into 2013.04.1