[Portland 2013] Greg Borchers proposal
Merge pull request #555 from webframp/greg-borchers

[Portland 2013] Greg Borchers proposal