Merge heads (3.6/default)
authorYury Selivanov <yury@magic.io>
Thu, 15 Sep 2016 17:37:39 +0000 (13:37 -0400)
committerYury Selivanov <yury@magic.io>
Thu, 15 Sep 2016 17:37:39 +0000 (13:37 -0400)

Trivial merge