memory leadks fix
Merge branch 'master' into chrome_popup
memory leacks fix
Merge branch 'master' into chrome_popup