More robust expand_to_fit handling, doesn't break with portrait images.
Merge branch 'master' of github.com:concerto/concerto