Updated to latest rust master