Merge branch 'stable-2.15'

* stable-2.15:
  Adjust comment related to commonmark dependency

Change-Id: I44bfc1194e9f27f269ed33652f813dcdfd7dda45