Merge branch 'bc/object-id' into base

Michael Haggerty committed Oct 28, 2017 at 09:27 UTC ff08e56cde739152a59a86f5aa996954a2ec0614

No changes.