Added some common stupid to the PIL import.
Merge remote-tracking branch 'origin/master'