Merge branch 'xsendfile_complete_zip_fix' of github.com:riso/owncloud-core...

Merge branch 'xsendfile_complete_zip_fix' of github.com:riso/owncloud-core into riso-xsendfile_complete_zip_fix from pull request #3307

Conflicts:
	lib/helper.php