Merge "Update to more recent docker image"