Merge branch 'master' into release/1.6
Merge branch 'release/1.6' of github.com:openeyes/OphTrOperationbooking into release/1.6