Merge branch 'release/1.1.36' v1.1.36
authorLaury GvR <laury@gaslightmedia.com>
Wed, 26 Dec 2018 14:00:44 +0000 (09:00 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 26 Dec 2018 14:00:44 +0000 (09:00 -0500)

Trivial merge