Support Guides with no image.
Merge branch 'master' into module