Merge pull request #496 from TheBlueMatt/2020-02-461-extra-mut