Merge branch 'stable-3.2' into pandora-3.2
authorGrazvydas Ignotas <notasas@gmail.com>
Sun, 24 Jun 2018 15:26:36 +0000 (18:26 +0300)
committerGrazvydas Ignotas <notasas@gmail.com>
Sun, 24 Jun 2018 15:33:21 +0000 (18:33 +0300)

Trivial merge