Merging master to BEF

Master needs to be merged to BEF

So this does it. It includes the commits that have been put into master-- mostly bug-fixes, insofar as I am aware.