Merge "bugfix for Dockerfile"