Add back in a line that was accidentally deleted
Merge branch 'master' into chrome_packaged_app_v2