Merge change 366 into donut

* changes:
  Filter bad calendar events.