Merge changes from upstream.

 Changes to be committed: