am 61ab270c: Add missing \'break\'s in switch statement, fixing bug 1876430

Merge commit '61ab270c17094ef1373f54d8fb9ade6d287c3a60'

* commit '61ab270c17094ef1373f54d8fb9ade6d287c3a60':
  Add missing 'break's in switch statement, fixing bug 1876430