merge 20131009

merge