Merge branch '82_duplicate_key_handling' into 'master'

Duplicate key handling

Closes #82

See merge request !78
2 jobs for docedit in 18 minutes and 12 seconds (queued for 2 seconds)
Status Job ID Name Coverage
  Build
passed #168065
docker-build
build_linux_36

00:17:50

64.0%
passed #168066
macosx
build_macosx_36

00:18:12

64.0%