fixed typo
added back orgext orm
Merge pull request #264 from shackbarth/19847

issue #19847: two bugfixes