Merge pull request #1097 from jmaas/release26

The fix for #991 broke "image"; this patch fixes that.