Handle captions explicitly to prevent non-compliant HTML  tables.
Merge branch 'master'