Merge branch 'master' into malware-1418