Hopefully this upsert code works
More work on upsert
Fix that annoying bug introduced by upsert + add changelog entry
Found a few more places where timestamp code could be simplyfied
Move the formatResults func to mysql query
Refactored the upsert query for postgres to be atomic
Merge pull request #2518 from janmeier/upsert

Upsert
Merge remote-tracking branch 'upstream/master'