Merge branch 'release/2020_05_04'

1 job for ObsPortal2020_05_04 in 2 minutes and 51 seconds (queued for 5 minutes and 36 seconds)
latest