Merge 3.5 (issue #25647)
authorYury Selivanov <yselivanov@sprymix.com>
Wed, 2 Mar 2016 15:49:36 +0000 (10:49 -0500)
committerYury Selivanov <yselivanov@sprymix.com>
Wed, 2 Mar 2016 15:49:36 +0000 (10:49 -0500)

Trivial merge