Merge pull request #6875 from JonnyH/WIP/mipmap-heuristic-tweaks Make arbitrary mipmap detection a config option
