Revert "Javascript"

This reverts commit 58d32004122629bf743b028784752f1db464be4b.
Revert "Revert "Javascript""

This reverts commit 32548e28b6c3a03a1974ddfac66de91462cc966a.
Merge remote-tracking branch 'origin/master'