Prefix the version with 'Zato'.
Merge branch 'master' into dsuch-f-gh278-add-smtp