Merge pull request #881 from mckern/1.5.x

(maint) Updated RHEL7 support in 1.5.x branch
Merge branch '1.5.x' into 1.6.x

* 1.5.x: