am 086a36f5: am 1aa3202b: Merge "Minor fixes: Add a missing "break" and some...
am 086a36f5: am 1aa3202b: Merge "Minor fixes: Add a missing "break" and some cosmetic fixes." into klp-dev
* commit '086a36f5':
Minor fixes: Add a missing "break" and some cosmetic fixes.