Merging master and updating changelog
Merging master and updating changelog


Former-commit-id: f9423217dc3483b7220f35be786e1f229693333f
gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine