Manually re-applying missing changes lost during the merge in cc07c33.

Problematic merge:
https://github.com/bcipolli/ka-lite/commit/cc07c333cffc1a96d59c9df57c7521d6b32cf384
Merge pull request #510 from jamalex/resolve_merge_patch

Manually re-applying missing changes lost during the merge in cc07c33.