Fix non-retina image examples
Merge branch 'master' into gh-pages