Merge branch 'stable-3.2' into pandora-3.2
authorGrazvydas Ignotas <notasas@gmail.com>
Sat, 16 Sep 2017 19:23:33 +0000 (22:23 +0300)
committerGrazvydas Ignotas <notasas@gmail.com>
Sat, 16 Sep 2017 19:23:33 +0000 (22:23 +0300)

Trivial merge