Updates from ivaynberg/select2