Merge "Fix JS syntax error"