Merge branch 'master' of https://github.com/danielnorberg/e2fsprogs into maint

(The single commit was missing a Signed-Off-By, but it was a trivial
change to a non-source file, so I've accepted it.)

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>