Merge tag 'v1.0.36' into develop
authorLaury GvR <laury@gaslightmedia.com>
Thu, 22 Jun 2017 18:08:40 +0000 (14:08 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 22 Jun 2017 18:08:40 +0000 (14:08 -0400)
v1.0.36


Trivial merge