doctrine/DoctrineModule — pull request #243 by Ocramius (2013-05-14 20:13:54+00:00)
Title: Hotfix/issue #170 rebased

Handles #170 and #240 with minor cleanups