Update to commonjs, via spm@3.x
Merge update to commonjs for spm@3.x