Fix wrong markup for bold text
Merge remote-tracking branch 'origin/pr/1271' into develop

Forward port #1271