filter for time in upcoming timeslots
Merge branch 'master' into icalendar

* master:
  filter for time in upcoming timeslots