Issue #28306: Merge from 3.6
authorBerker Peksag <berker.peksag@gmail.com>
Wed, 28 Sep 2016 19:49:46 +0000 (22:49 +0300)
committerBerker Peksag <berker.peksag@gmail.com>
Wed, 28 Sep 2016 19:49:46 +0000 (22:49 +0300)

Trivial merge