Merge branch 'master' into old
updated regex email
updated regex email
updated regexp email