Please merge the branch

Chris, Marco thinks the whole branch needs integrating.