Merge branches 'master' and 'master' of github.com:jquery/jquery
Fix #14492: More correct jQuery.parseJSON. Close gh-1419.
(cherry picked from commit 60a6178131afec97b68c9a45bc24459f7b8bd905)

Conflicts:

	src/ajax/parseJSON.js