Backport IFRC fixes
Merge branch 'master' of git://github.com/flavour/ifrc
missed one
Backport Role Manager fix
Merge branch 'master' of git://github.com/flavour/ifrc
Merge branch 'master' of git://github.com/flavour/ifrc_qa