Merge pull request #5090 from colemanw/explorer