pull and merge 1-28-14