Comment 2 for bug 786763

Working version copied to main and dev, confirmed working. It has a few minor bugs, like it's pretty much impossible to close, but that's for another day ;)