Merge changes from upstream/Bleeding-Edge.