20140826merge

20140826merge