Merge branch 'master' of github.com:gem/oq-engine into light-site-collection
Merge branch 'light-site-collection' of github.com:gem/oq-engine into light-site-collection