Sync. Including fix for segfault when image name missing.