#824 - Fixed notification template
Merge branch 'master' into bixly-testing