[nobug] togetherjs hotfix
Merge remote-tracking branch 'mozilla/master'