Fix #866
Merge remote-tracking branch 'upstream/master' into upstream

Conflicts:
	zp-core/zp-extensions/downloadList.php

	modified:   zp-core/zp-extensions/downloadList.php