Merge pull request #1 from rackerlabs/master

Pull in upstream