merged master
merged master


Former-commit-id: a4fcb594ef877b2a79033bad0e3c96b89db0b0de [formerly 0d9cf949bbb599b2c15414c38d87d0a05277bd05]
Former-commit-id: ec701cb370a51e83f6207f270a0de4b2cd75520f
gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine