Merge branch 'MDL-28340_advanced_search_other_users' of git://github.com/andyjdavis...