LIB001-667 Calendars Collection
Merge remote-tracking branch 'upstream/master'
Merge pull request #110 from seesmith/master

Calendar updates