Adapt to the upcoming salt 0.16.0 which fixes issue #661.