Most likely fixing #382
Merge branch 'develop' into feature/cancellable-reservations