Deal with the move to salt 2014.7.0