Fix exception when viewing comment markup help
Merge branch 'staging' into stable