Merge from upstream, SVN change #209972