Another quick fix. Pushing to master.. Living life on the edge!
Merge remote-tracking branch 'origin/master' into ChangeToEventAndLogbook