Commits in ~smarr/eg/smarrs-mainline:git-1.7.5-compatibility