Kludgy fix of non-power of two image artifacts
Merge branch 'master' into megan