Issue #27306: Merge from 3.5
authorBerker Peksag <berker.peksag@gmail.com>
Mon, 13 Jun 2016 21:49:05 +0000 (00:49 +0300)
committerBerker Peksag <berker.peksag@gmail.com>
Mon, 13 Jun 2016 21:49:05 +0000 (00:49 +0300)

Trivial merge