Merge "Fix code style in EmailNotification.php"