Merge branch 'docker-build' into osm/master