replace .live with .on
Merge remote-tracking branch 'upstream/master'