Reword the viewport stuff to be about variable-sized images.
Merge branch 'master' into gh-pages