merge 20140109