1155604 - fixing incorrect formatting of a note
Merge remote-tracking branch 'origin/1166202' into 2.5-release
Merge remote-tracking branch 'origin/1166202' into 2.5-testing
Merge pull request #1331 from skarmark/1155604

1155604 -  fixing incorrect formatting of a note
Merge branch '2.4-release' into 2.5-release
Merge branch '2.5-release' into 2.5-testing
Merge branch '2.5-testing' into 2.5-dev
Merge branch '2.5-dev' into 2.6-dev
Merge branch '2.6-dev'