Merge branch 'master' into develop
updating to dev version 2.5-SNAPSHOT
Creating custom Message-ID header to hide host system information
incrementing version to 2.5
Merge branch 'release-2.5'