Merge branch 'file-parsing-fix' of https://github.com/larsbutler/oq-engine
fixtures regenerated
Merge branch 'master' of https://github.com/gem/oq-engine into update-scenario-fixtures
ensure building the fixtures in a proper order
reload riskcalculation object in test helpers
Merge pull request #1248 from matley/update-scenario-fixtures

Update test fixtures used for risk scenario calculations