Merge pull request #1492 from matrix-israel/fix_dated_reminders