Integrate modules for ical integration
Merge commit '522440c671fcf6cf146e77ff910978107a12ca99' into 7.x-stable