Updated from master
Updated from master


Former-commit-id: d307477aabd802012665fa53e4efc1a2dcce9cc9 [formerly b9dc98eba4b6f2adc46cb3ea2a7ec090b375e6ce]
Former-commit-id: 96f58de7c0ec17e5b4c9e037af47d27013573440
gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine