I got a compile error from r14983, basically it couldn't find 'object_finder_base'.
I had to include a template in 2 places before it would compile.
Line 436 changed:
Line 470 changed:
Then it built fine.