merging in #2610 remove pbcpp.py
Merge branch 'next' into sam_2156