Merge: rev751 (Show a message in the user session if an email address from his/her account was recently invalidated.)