Update upstream

Merging with latest upstream, so that the `notifydispatcher` works with our fork (today's change f4a3449 made it incompatible).