Merge branch 'bottfric' into bdy_2d

Conflicts:
	src/2d/variables_2d.F90
3 jobs for 13_bdy_2d
Status Job ID Name Coverage
  Build
failed #1055
build

 
  Test
skipped #1057
allowed to fail
code_quality
skipped #1056
test
 
Name Stage Failure
failed
build Build There has been a timeout failure or the job got stuck. Check your timeout limits or try again
No job log