Merge branch 'garth/make-ufc-element-protected'
Merge branch 'master' into next