master
Merge branch 'maint' into next
libext2fs: create inlinedata symlinks
tests: don't run sed multiple times on test output