Take a screenshot, take 2
Merge pull request #862 from seandst/browser-none-screenshot

Take a screenshot, take 2