Rebase on docker/master