merge 11-11-14