Update from upstream 08/10/14 11:04:00