Merge branch 'dev' into 'master'

Dev

See merge request !194
2 jobs for xpub-epmc-r1-6-1 in 11 seconds (queued for 1 second)
latest
Status Job ID Name Coverage
  Build
failed #57846
build

00:00:11

 
  Test
skipped #57847
lint
 
Name Stage Failure
failed
build Build
 Version:           19.03.5
API version: 1.40
Go version: go1.12.12
Git commit: 633a0ea838
Built: Wed Nov 13 07:22:05 2019
OS/Arch: linux/amd64
Experimental: false
error during connect: Get http://docker:2375/v1.40/version: dial tcp: lookup docker on 8.8.8.8:53: no such host
ERROR: Job failed: exit code 1