CentOS 6 support
Merge branch 'centos'