merge 8/4/2014