Null merge from 3.6
authorBerker Peksag <berker.peksag@gmail.com>
Sun, 18 Sep 2016 10:58:16 +0000 (13:58 +0300)
committerBerker Peksag <berker.peksag@gmail.com>
Sun, 18 Sep 2016 10:58:16 +0000 (13:58 +0300)

Trivial merge