Merge branch 'stable-2.10'

* stable-2.10:
  SideBySide2: Correct placement of column margin bar