Fixed language and subtitle issue for new shows.

Subtitle and language opts where ordered backwards causing incorrect
values to be set.
Merge remote-tracking branch 'remotes/upstream/dev' into testing