Merge branch 'stable-3.2' into pandora-3.2
authorGrazvydas Ignotas <notasas@gmail.com>
Sun, 3 Jul 2016 00:22:57 +0000 (03:22 +0300)
committerGrazvydas Ignotas <notasas@gmail.com>
Sun, 3 Jul 2016 00:22:57 +0000 (03:22 +0300)

Trivial merge