Merge remote-tracking branch 'my/pr-orm-querytable-nil-ptr-struct' into mymaster
gofmt