PNG resizing color, upgrade from 1.6 bug fix

Also patch for XSS via uploaded filename