Merge branch 'master' into feature/separate_ac_land_water

# Conflicts:
#	HISTORY.rst
3 jobs for feature/separate_ac_land_water in 12 minutes and 43 seconds (queued for 3 minutes and 38 seconds)
Status Job ID Name Coverage
  Test
passed #70686
test_enpt

00:10:26

91.0%
passed #70687
test_styles

00:00:44

passed #70688
test_urls

00:01:32