Merge 20130602_3