Merge branch 'blechta/fix-issue-301'
Merge branch 'blechta/fix-issue-336'
Make pointer to underling ufc::finite_element protected in dolfin::FiniteElement.

Was previously private.
Merge branch 'garth/make-ufc-element-protected' into next