Fix csv files being written to xbmc sources
Merge branch 'master' into 2.6.0