@jgoguen: No problem

.
I'll be waiting for more people to test this though, because after a bit more testing, I appear to have managed to break stuff in certain circumstances (cf. latest edit of
#1137) ^^.
That said, I can launch the PR right now if you prefer that as a means of code review?
(In the mean time, pushed
on GH).