Update to uptream 30-Jun-14

Update to upstream