Further complex simplifications
by Ham, David A 04 Oct '18

04 Oct '18
UFL complex branch is merged
by Ham, David A 03 Oct '18

03 Oct '18