Update from Mountain Lion

Update from Mountain Lion