Merge pull request #229 from Mirantis/newton

Newton compatability