Attempt to fix event unbooking
Merge branch 'master' into production