Example 5.1 of Paul's paper
Fix for recent dolfin
Get rid of an unnecessary line
Merge