merges from rackspace-user - upstream