Mangler cosmetic cleanup

Signed-off-by: Julien Danjou <julien@danjou.info>
Merge branch 'master' into pr/144