RFC #385 is currently active
Merge pull request #408 from blaenk/activate-385

RFC #385 is currently active