Fix for previously patched download ability breaking playback
Merge branch 'release/2.11' into develop

* release/2.11:
  Fix for previously patched download ability breaking playback

Conflicts:
	page.cdr.php