Aaargh, reverting accidental self-merge
Merge pull request #7 from janimattiellonen/2.2-orm-update

Aaargh, reverting accidental self-merge