Merge from 3.5
authorBerker Peksag <berker.peksag@gmail.com>
Sun, 12 Jun 2016 16:18:17 +0000 (19:18 +0300)
committerBerker Peksag <berker.peksag@gmail.com>
Sun, 12 Jun 2016 16:18:17 +0000 (19:18 +0300)

Trivial merge