google change in line with 2014 EFF report
Merge branch 'editor'