Pylons/pyramid — pull request #1433 by aconrad (2014-10-20 18:26:31+00:00)
Title: Feature.root package

Fix merge conflict.