Experiment 26 in progress.
Merge branch 'mock-objects' of github.com:mbforbes/pr2_pbd into mock-objects