Merge branch 'integration' into docker_0.6.1