Issue #28283: Merge from 3.6
authorBerker Peksag <berker.peksag@gmail.com>
Tue, 27 Sep 2016 21:40:42 +0000 (00:40 +0300)
committerBerker Peksag <berker.peksag@gmail.com>
Tue, 27 Sep 2016 21:40:42 +0000 (00:40 +0300)

Trivial merge