Try figuring out Travis failure :(
Upgrade test to not make umask assumptions
Merge branch '1.7' into 1.8
Merge branch '1.8'