[alvherre]

We strive to have exactly one feature or bugfix per commit. Squashing commits to a single one does not mean we mix stuff randomly.