Suppress unnecessary use of $.inArray
Merge remote-tracking branch 'origin/master'