Imported Dockerfile (but, doesn't work...)
Merge branch 'master' into docker-build
Imported Dockerfile