Merge pull request #2728 from amitajgaonkar/select2