Merge tag 'v1.1.36' into develop
authorLaury GvR <laury@gaslightmedia.com>
Mon, 27 Nov 2017 21:41:35 +0000 (16:41 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 27 Nov 2017 21:41:35 +0000 (16:41 -0500)
v1.1.36


Trivial merge