Merge branch 'master' into firedrakeConnection-functional to get rid of py2.6 CL