Updated to upstream/Bleeding-Edge version