Issue #21903: Merge from 3.6
authorBerker Peksag <berker.peksag@gmail.com>
Wed, 28 Sep 2016 14:08:06 +0000 (17:08 +0300)
committerBerker Peksag <berker.peksag@gmail.com>
Wed, 28 Sep 2016 14:08:06 +0000 (17:08 +0300)

Trivial merge