Backport fixes
Merge branch 'master' of git://github.com/flavour/ifrc
Merge branch 'master' of git://github.com/flavour/ifrc_qa