am 8c8eb23d: Merge "Add 64bit large object support"

* commit '8c8eb23d31768bca01e2fd69c3931aeda31f3329':
  Add 64bit large object support