update main from iinux 201406132251 

update main from iinux 201406132251 2