Merge branch 'stable-3.2' into pandora-3.2
authorGrazvydas Ignotas <notasas@gmail.com>
Sun, 15 May 2016 12:42:35 +0000 (15:42 +0300)
committerGrazvydas Ignotas <notasas@gmail.com>
Sun, 15 May 2016 12:42:35 +0000 (15:42 +0300)

Trivial merge