reintroduce commits de96741..af744a0. the merge in 5a2f325c in fact didn't merge anything
we're still in draft mode
fix a failing line wrap