Merge 3.4
authorYury Selivanov <yselivanov@sprymix.com>
Fri, 20 Nov 2015 17:57:47 +0000 (12:57 -0500)
committerYury Selivanov <yselivanov@sprymix.com>
Fri, 20 Nov 2015 17:57:47 +0000 (12:57 -0500)

Trivial merge