Merging due to amended commit
Merge branch 'subtitles_hotfix' of github.com:dylanjbarth/ka-lite into subtitles_hotfix