Update to use master Calendar plugin not our fork

No need to use a fork after our changes were merged