Remove unused variable in libImaging
Merge pull request #937 from radarhere/master

Remove unused variable in libImaging
Fix rename regression
Merge pull request #939 from hugovk/deferred_error_regression

Fix regression