Version bump and bug fix for user search in Multisite
Resolved conflicts leaving master on 2.1, with changes from 2.0.2