Merge "OPP: Fix support for vCal 1.0 and iCal 2.0"