Improve error message for missing image binding.
Merge branch 'master' into deploy-test