Merge branch 'hotfix/1.1.36' v1.1.36
authorLaury GvR <laury@gaslightmedia.com>
Mon, 27 Nov 2017 21:41:30 +0000 (16:41 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 27 Nov 2017 21:41:30 +0000 (16:41 -0500)

Trivial merge