Merge remote-tracking branch 'lscsoft/master' into HEAD

- fix merge conflicts introduced from commits
24deb858 and e141bf6e
12 jobs for ResamplingFstat_OpenCL-dev in 31 minutes and 28 seconds (queued for 3 seconds)
latest
Status Job ID Name Coverage
  Level0
passed #64267
level0:lal

00:06:15

 
  Level1
passed #64268
level1:lalframe

00:02:28

passed #64269
level1:lalmetaio

00:02:35

passed #64270
level1:lalsimulation

00:04:42

passed #64271
level1:lalxml

00:02:25

 
  Level2
passed #64272
level2:lalburst

00:02:52

passed #64273
level2:lalinspiral

00:06:08

passed #64274
level2:lalpulsar

00:05:19

passed #64275
level2:lalstochastic

00:02:40

 
  Level3
passed #64276
level3:laldetchar

00:02:27

passed #64277
level3:lalinference

00:07:48

 
  Level4
passed #64278
level4:lalapps

00:06:32