use Pillow all around
Merge 'ella/master' into 'WhiskeyMedia/master'