Enable build on RHEL and CentOS
Merge pull request #1317 from nealef/master

Enable build on RHEL and CentOS