gem/oq-engine — pull request #1551 by micheles (2014-10-14 02:56:29+00:00)
Title: Fixed two merge errors

These are breaking master.