merge upstream master of select2 + select2/issue-1654