Issue #29129: Merge from 3.6
authorBerker Peksag <berker.peksag@gmail.com>
Mon, 2 Jan 2017 02:51:31 +0000 (05:51 +0300)
committerBerker Peksag <berker.peksag@gmail.com>
Mon, 2 Jan 2017 02:51:31 +0000 (05:51 +0300)

Trivial merge