Merge branch 'master' of github.com:schleg/docker-test