fixed js error
Merge branch '1-3-stable' into 2-0-stable