Merge branch 'master' into firedrakeConnection-functional