Merge "Replace deprecated jQuery event aliases"