Merge branch 'stable-2.10'

* stable-2.10:
  Update 2.10 release notes
  SideBySide2: Fix alignment for long insertion/deletion blocks