Added shim support
Merge remote-tracking branch 'origin/requirejs2'