Add support for EL6 and fix export bug.
Merge remote branch 'origin/master'