Merge branch '82_duplicate_key_handling' into 'master'

Duplicate key handling

Closes #82

See merge request !78
3 jobs for master in 19 minutes and 1 second (queued for 6 seconds)
Status Job ID Name Coverage
  Build
passed #167052
docker-build
build_linux_36

00:14:47

64.0%
passed #167053
macosx
build_macosx_36

00:15:54

64.0%
 
  Deploy
passed #167054
docker
deploy_beta

00:03:07