Fixes #3369, Spoiler image parsing fails

- Adapted pattern
- Manually adapted reference html
- adapted tests where necessary
- improved test failure messages
Merge branch 'release'