Merge remote-tracking branch 'upstream/master' into stable
Merge branch 'stable' into ffbadges