Merge remote-tracking branch 'Xfennec/master'