Merge branch 'trunk' into 'master'

build -> pack

See merge request docker/dind!14