AG: video - allow wrapperLocation to be overriden

Pull request seems to have a bunch of commits...lets see what happens!