Video update
Merge branch 'master' into 20141205-KED-2

Conflicts: