Work to remove the gmf_scenario table
Merge branch 'master' of github.com:gem/oq-engine into remove-gmf_scenario
Merged from master
Fixed a few merge errors
Fixed a few QA tests depending on GmfScenario
Fixed another test
Merged from master
Updated another docstring
Minor change
Merge branch 'master' into remove-gmf_scenario
Merge pull request #1183 from gem/remove-gmf_scenario

Remove gmf scenario
Merge branch 'master' into smart-block_size