stevepiercy/pyramid — pull request #1 by stevepiercy (2014-05-04 07:57:20+00:00)
Title: one more to cherry-pick

(cherry picked from commit 934d7fe)