Merge branch 'stable-3.2' into pandora-3.2
authorGrazvydas Ignotas <notasas@gmail.com>
Sun, 20 Aug 2017 14:34:06 +0000 (17:34 +0300)
committerGrazvydas Ignotas <notasas@gmail.com>
Sun, 20 Aug 2017 14:34:06 +0000 (17:34 +0300)

Trivial merge