daily merge 20141018