Merge from 3.6
authorBerker Peksag <berker.peksag@gmail.com>
Thu, 15 Sep 2016 17:24:13 +0000 (20:24 +0300)
committerBerker Peksag <berker.peksag@gmail.com>
Thu, 15 Sep 2016 17:24:13 +0000 (20:24 +0300)

Trivial merge