make <span class='problem'> work
undo accidental deletion
Merge commit 'github/testing' into beta