Merge branch 'master' of https://gitlab.sib.swiss/pbansal0/test-docker

Conflicts:
	README.md
2 jobs for master in 7 minutes and 41 seconds (queued for 17 minutes and 55 seconds)
latest