Merge pull request #6369 from colemanw/explorer