Comment 4 for bug 503322

Awesome, push it through to main if you haven't already :)

As for the space between the number and the chapter, this will need to be fixed eventually. :)