Fix fatal error from using incorrectly named function
Replace badgestack verbiage.
Merge remote-tracking branch 'origin/master'