Merge tag 'v1.0.36' into develop
authorLaury GvR <laury@gaslightmedia.com>
Mon, 8 May 2017 21:55:13 +0000 (17:55 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 8 May 2017 21:55:13 +0000 (17:55 -0400)
v1.0.36


Trivial merge