Merge branch 'contactangle', remote-tracking branch 'origin' into contactangle
*fix a bug in computation of contact line forces