[skip hazardlib][demos] Merge branch 'master' into fix_shape
[skip hazardlib][demos] Merge branch 'master' into fix_shape


Former-commit-id: 7cdd576f64bcedca275e3fee330ba7eca28cd33e [formerly 7cdd576f64bcedca275e3fee330ba7eca28cd33e [formerly e2a094304139b291a61f5c7d00a6af8bb58f32ef]]
Former-commit-id: fb8494bad69d7f73a46492d74edc7e174eb672b3
Former-commit-id: 1a502ac1d5c9e2b1dc463faf565c8d5733ea27e3
gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine