CAL-514 CAL-524 Import iCalendar improvement
Merge branch 'fix/4.0.x/CAL-514'
Merge remote-tracking branch 'origin/master'