Bug 828936 - make video deletion work r=daleharvey a=blocking+
Merge pull request #7527 from davidflanagan/bug828963

Bug 828936 - make video deletion work r=daleharvey a=blocking+
Auto-merge from branch 'master'