My suspicions were unfounded
Merge branch 'feature/html-opml-note-escape-bug' into develop

Conflicts:
	TODO.md
	src/main/python/help.py