Merge branch 'release/1.0.36' v1.0.36
authorLaury GvR <laury@gaslightmedia.com>
Thu, 22 Jun 2017 18:08:33 +0000 (14:08 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 22 Jun 2017 18:08:33 +0000 (14:08 -0400)

Trivial merge