Merging rackerlabs:master changes