130808.2
130809
130810
Merge branch 'unstable'

Conflicts:
	include/video-common-head.php