select2 v3.5.4

Fixes #530
Fixes #540