Make images (PNGs, at least) work locally
Merge branch 'master' into img
Merge branch 'master' into img