move from pbc3.1 branch to master now that we've merged