merge 11-22-13