Merge branch 'master' into develop
case 2293 - Handle arbog reservations.
Merge branch 'case-2293' into develop
Merge remote-tracking branch 'origin/develop'