Packages from the vendor stefan

stefan/icalmerge