fix misspelled rowspan property in skipped test
Merge branch 'master' into alternate-layout-manager