gifv, mp4 support
Merge remote-tracking branch 'origin/master'