7/29/14 merges