Merge branch 'master' into release
bugfix in reminder template
Merge branch 'release'