Update from upstream, up to 1-st Oct

So it goes..