master
Merge branch 'maint' into next
e2fsck: fix sparse bmap to extent conversion
tests: don't run sed multiple times on test output