Allow the use of PIL from Pillow
Merge remote-tracking branch 'alisterhood/master'