Merge remote-tracking branch 'pivos/master' into xbmc-12.2