Merge pull request #3700 from colemanw/spinner