Merge branch 'fix_epggrid_crash' of https://github.com/janbar/xbmc into local