Sync patches with upstream changes.
all merged up to date now - thanks
Pull-Request has been closed by billauger
Sync patches with upstream changes.