Object Linker Modifications
Merge pull request #1 from NBywell/6.x

Object Linker Modifications
Merge pull request #1 from FBA/6.x

Get latest from parent repository