Linux

These are the changes that were necessary for the CentOS 6 build. @LeeKamentsky, since we're so close to release, can you please review them before merging into master?