Merge 3.5 (issue #26338)
authorYury Selivanov <yselivanov@sprymix.com>
Wed, 2 Mar 2016 16:17:18 +0000 (11:17 -0500)
committerYury Selivanov <yselivanov@sprymix.com>
Wed, 2 Mar 2016 16:17:18 +0000 (11:17 -0500)

Trivial merge