Merge pull request #182 from gjordi/3.0.x

Bug Fix: InsertOrUpdateGeneratorPostgres