Account for e-mail error
Merge branch '7.x-1.x' into dev