Merge pull request #815 from bradymiller/calendar-outlook-only_1