avoid block-level inside <caption>
Merge commit 'github/testing' into beta