Merge branch 'master' into risklib-refactor-no-asset
Merge branch 'master' of https://github.com/gem/oq-engine into risklib-refactor-no-asset
Merge pull request #1049 from matley/risklib-refactor-no-asset

updates due to the latest risklib api changes