Merge pull request #2670 from colemanw/mini