Updated from master [skip CI]
Updated from master [skip CI]


Former-commit-id: b5356a60011773f22717fdf04659348eee8a03f4 [formerly 27d2a6a5a4efcf18ea2541f142da921a43153a8a]
Former-commit-id: 50dce1fd6f26393b888fae2b2a59f278bbaeab41
gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine