Apply commit 06440a6bf8deb4cbfcf102c6ad4df9e95887d1ad from upstream (select2)