Merge "Update email version number" into ub-mail-master