Merge "Pull correct docker images for master branch"