fix
Merge branch 'image_fallback' of github.com:carolanitz/VideoPanorama into image_fallback