fix: requirejs
Merge remote-tracking branch 'remotes/upstream/master'