Merge branch 'maint' into next

diff --cc debian/rules
Simple merge

diff --cc misc/ext4.5.in
Simple merge

diff --cc misc/mke2fs.8.in
Simple merge

diff --cc misc/mke2fs.conf.5.in
Simple merge

diff --cc misc/tune2fs.8.in
Simple merge