Update to latest master

Resolves the conflicts caused by the recent script and drowning patches in Zini's master branch