Merge tag 'v1.0.36' into develop
authorLaury GvR <laury@gaslightmedia.com>
Thu, 21 Jun 2018 18:51:57 +0000 (14:51 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 21 Jun 2018 18:51:57 +0000 (14:51 -0400)
v1.0.36


Trivial merge