Merge branch 'master' into 'master'

exterior stokes 2d

See merge request !15