Merge branch 'stable-3.2' into pandora-3.2
authorGrazvydas Ignotas <notasas@gmail.com>
Sun, 28 Feb 2016 01:51:23 +0000 (03:51 +0200)
committerGrazvydas Ignotas <notasas@gmail.com>
Sun, 28 Feb 2016 01:51:23 +0000 (03:51 +0200)

Trivial merge