6/8/14 merge