2/17/14 Merge