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