Started to fix the problem with recurring events not being picked up
Merge remote-tracking branch 'origin/master'