Merge from 3.6
authorBerker Peksag <berker.peksag@gmail.com>
Fri, 25 Nov 2016 17:10:51 +0000 (20:10 +0300)
committerBerker Peksag <berker.peksag@gmail.com>
Fri, 25 Nov 2016 17:10:51 +0000 (20:10 +0300)

Trivial merge