Merge branch 'hotfix-2.1.13'
Fix to sync users being able to edit events that don't belong to them interactively
Merge branch 'hotfix-2.1.14' into develop