remove define.amd.jQuery
Merge remote-tracking branch 'upstream/master'