Merge "Accept the calendar name in addition to the owner as a calendar filter." into nyc-dev