Merge remote-tracking branch 'origin/master'

Conflicts:
	downloads/xbmc-ball-streams-frodo.2.8.8.zip
	downloads/xbmc-ball-streams-gotham-helix.2.8.8.zip