Fix for older mod versions that used a different alias.
Merge remote-tracking branch 'refs/remotes/upstream/master'