search user 1.11

search user 1.11
search user
Merge remote-tracking branch 'origin/master' into 1.1bug_fixes