Merge upstream 2014 08 07