Merge 20130602_2