Changed the format of the message template
Merge remote-tracking branch 'origin/master'