fix bug with static vs. nonstatic method.
Merge branch 'mock-objects-pr2' of github.com:mbforbes/pr2_pbd into mock-objects-pr2