update for current FEniCS trunk version