Merge remote-tracking branch 'refs/remotes/origin/extensible-feature-agenda-view3'
Merge remote-tracking branch 'refs/remotes/origin/bug-fixed-with-event-update'
Merge remote-tracking branch 'refs/remotes/origin/teamup-override-1-daterange-formatting'
Merge remote-tracking branch 'refs/remotes/origin/teamup-override-2-english-GB-file'