Syncing with latest KickJs release 

Syncing latest changes from KickJs into glepag1 fork