merge 2013-10-11