Merge pull request #780 from JulianHBuecher/docker-execution-fix