Prevent left margin offset in highlighted lines

[Delivers #66249320]
Bump version number
Merge branch 'master' into stable