Merge branch 'hotfix/1.0.36' v1.0.36
authorLaury GvR <laury@gaslightmedia.com>
Mon, 8 May 2017 21:55:09 +0000 (17:55 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 8 May 2017 21:55:09 +0000 (17:55 -0400)

Trivial merge