failing
Merge branch 'master' into chrome_popup