2226: Fixing round trip between uploads and editor messing up newlines
Merge branch 'dev' of github.com:pculture/unisubs into dev