Configure mail
Merge remote-tracking branch 'upstream/master'
Version update on release