Make firefuck happy
Merge remote-tracking branch 'upstream/master'
Fix deprecated API use