Merge pull request #7126 from remitamine/vimeo