Email June 17, 2013 fixes