Changes to work with ansible 1.6