Rackspace compatible
Updated from master