merge tvdb_api updates