Merge pull request #1056 in master
Fix ordered list spacing
Merge pull request #1072
Merge pull request #1072 in develop