iCalendar Fix
Merge remote-tracking branch 'upstream/Pistachitos' into Pistachitos
Reverted file back to original functionality