Issue 1160993

Addresses https://bugs.launchpad.net/openquake/+bug/1160993

Requires https://bugs.launchpad.net/openquake/+bug/1160845