debugging updates
merge from master
Merge branch 'winbuild' of https://github.com/wiredfool/Pillow into winbuild