#386 Reverted accidental change in c4bb301a33a27547ff186acbd0559d395fa05c28
Merge branch 'feature/386-ORM-support' of git://github.com/janus-ssp/janus into feature/386-ORM-support