Merge branch 'stable-3.2' into pandora-3.2
authorGrazvydas Ignotas <notasas@gmail.com>
Sun, 23 Oct 2016 19:10:54 +0000 (22:10 +0300)
committerGrazvydas Ignotas <notasas@gmail.com>
Sun, 23 Oct 2016 19:10:54 +0000 (22:10 +0300)

Trivial merge