Image fixes.
Merge remote-tracking branch 'origin/master' into ever-scrolling-posts