Merge pull request #2053 from ronie/xbmcvfs-write