Comment 7 for bug 1674057

I have been liasing with upstream to sort of the few remaining issues, they have been super responsive, and for the the most part those are fixed upstream, I will update the packaging with upstream fixes once I get back into range of a power point! in the next day or three.