More doc tests
Fix block-img and more doc tests
Fix label spans
Merge branch 'master' into 1.1.x