3.2.1 prep
Merge pull request #214 from mhaskel/3.2.1-prep

3.2.1 prep
Missed some EL7 platforms
Merge pull request #215 from mhaskel/3.2.1-prep

Missed some EL7 platforms
Merge pull request #216 from mhaskel/test

Merge 3.2.x into master