mhash isn't needed
Remove use of deprecated Horde::img()
Merge branch 'master' into imp_6_2