Merge upstream 1

[Interpause]

While it has yet to happen, as a safety precaution against leaving the plugin unusable, I will do upstream updates as pull requests from now on.

Tasks to do:

• [x] review changes made to determine if it will affect the backend server
• [x] test the plugin still works (especially inpainting)