Missing break statement in switch

See BUG: 309
Merge branch 'release-2-2' into release
Merge branch 'release'