[skip CI] Merge branch 'master' into less-events
[skip CI] Merge branch 'master' into less-events


Former-commit-id: 1d712c925b5de9138eaaf8726ca2a254850b5995 [formerly 1d712c925b5de9138eaaf8726ca2a254850b5995 [formerly c360a04ed619827ad93461784bcf4fada411cea5]]
Former-commit-id: 7e766254cc9191f906ec93162b9b6f098b3701d4
Former-commit-id: 09f7a3706f0d6b9db790ae1f2037288e60eaac62
gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine