Upstream 20130207 rev 3615