Merge branch 'combine' into 'master'

Allow to correct zero offset in mpdaf_merging_sigma_clipping

See merge request !163
9 jobs for master in 21 minutes and 21 seconds (queued for 6 seconds)
Status Job ID Name Coverage
  Test
passed #8262
check-setup

00:02:01

passed #8263
docs

00:05:03

passed #8261
py35

00:06:05

76.0%
passed #8260
py36

00:06:10

76.0%
passed #8253
py37

00:14:46

77.0%
failed #8254
check-setup

00:00:12

failed #8255
docs

00:00:12

failed #8251
py35

00:00:13

failed #8252
py36

00:00:13