[master] merge win,mac js