mantis 33814
Merge branch 'master' of https://github.com/marcdexet/user_shibb