Fixes https://bugs.launchpad.net/openquake/+bug/1087239
Fixes https://bugs.launchpad.net/openquake/+bug/1087239


Former-commit-id: e1475621170571f5f9ce56caa772ea41618a7b98 [formerly bf7d130e0e85e221948fd908f1433ec7300eeb7b]
Former-commit-id: 6561ce62e2009a28316b9d3480b300accec80b7c
gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine