2059: Trying yet another fix
Merge branch 'dev' of github.com:pculture/unisubs into dev