Update for Mink 1.6 compatibility
Merge pull request #3175 from tractorcow/pulls/3.1/mink-update

Update for Mink 1.6 compatibility (DO NOT MERGE)