Optimize images; use hosted resources.
Merge remote-tracking branch 'upstream/master'