Copy in latest js from master