Merge 3.6 (issue #28720)
authorYury Selivanov <yury@magic.io>
Wed, 16 Nov 2016 23:25:48 +0000 (18:25 -0500)
committerYury Selivanov <yury@magic.io>
Wed, 16 Nov 2016 23:25:48 +0000 (18:25 -0500)

Trivial merge