These changes fix problems with styles containing numbering information.
Merge branch 'numbering'
Bringing updates to paragraph numbering into master branch.