Merge branch 'master' of https://github.com/gem/oq-engine
Merge branch 'master' of https://github.com/gem/oq-engine
Merge branch 'db-security-cleanup' of https://github.com/larsbutler/oq-engine
Merge branch 'delete-calculations' of https://github.com/larsbutler/oq-engine
Merge branch 'master' of https://github.com/gem/oq-engine
Merge branch 'master' of https://github.com/gem/oq-engine
bugfix. scenario calculator self.exposure_model -> self.rc.exposure_model
Merge pull request #1069 from gem/fix-scenario

Fix Scenario Risk calculator