xbmc/xbmc — pull request #4716 by Memphiz (2014-05-14 15:48:51+00:00)
Title: Backports from nospiffs fork

Some imo straight forward backports from @nospiff