Merge upstream 20141006