Fix regression.
Fix regression in image.
Fix annotator regressions.
Merge branch 'entspannt' of https://github.com/substance/article into entspannt