Sean had a brainy idea

Let's see how it goes
Merge remote-tracking branch 'origin/master' into Sean's-new-idea
Merge pull request #1 from laststraw/Sean's-new-idea

Sean's new idea