* commit '5ebef79a': Fix instances of broken indentation found by gcc 6 Noop, see 21d3f0c0, 6089c44aMerged-by: Clément Bœsch <u@pkh.me>