Merge branch 'master' into 244-default-to-using-the-lalcbcwaveformgenerator

12 jobs for 244-default-to-using-the-lalcbcwaveformgenerator in 15 minutes and 7 seconds (queued for 3 seconds)