Bug 837373 - Check for valid favicon before scaling it. r=mfinkle a=akeybl
Bug 834525: Remove unnecessary log. [r=mfinkle] [a=akeybl]

--HG--
extra : rebase_source : 20d2e74d3f06966147cd847e91788e3893a7c19e
Bug 832193 - Content Security Policy: a source of *.something.com is mistakenly interpreted as a source of http://*:80 (r=sstamm a=lsblakk)
Bug 829284 - Unity plugin doesn't display in HiDPI mode. r=bgirard a=lsblakk