More work, mock commonjs/requirejs.
Merge remote-tracking branch 'origin/master'