Test fast jet310b1

Merging from updated fastjet branch, plus other changes.