Merge from upstream 20140611