fix cleanup
Merge branch 'master' of https://github.com/Grervirg/Xbmc/
Merge branch 'master' of https://github.com/Grervirg/Xbmc/
Merge branch 'master' of https://github.com/Grervirg/Xbmc/
Merge branch 'master' of https://github.com/Grervirg/Xbmc/