Merge 3.6 (after null merge with 3.5)
authorYury Selivanov <yury@magic.io>
Thu, 15 Sep 2016 17:50:28 +0000 (13:50 -0400)
committerYury Selivanov <yury@magic.io>
Thu, 15 Sep 2016 17:50:28 +0000 (13:50 -0400)

Trivial merge