Merge pull request #6 from vimeo/master
Master --> Dev v5.4
Merge pull request #4 from vimeo/qa
Qa to dev