Main checkin of ORM code
wq!
^X
Merge remote-tracking branch 'upstream/master'