Merge tag 'v1.1.36' into develop
authorLaury GvR <laury@gaslightmedia.com>
Wed, 26 Dec 2018 14:00:49 +0000 (09:00 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 26 Dec 2018 14:00:49 +0000 (09:00 -0500)
v1.1.36


Trivial merge