Merge tag 'v1.0.26' into develop
authorLaury GvR <laury@gaslightmedia.com>
Mon, 27 Nov 2017 20:48:37 +0000 (15:48 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 27 Nov 2017 20:48:37 +0000 (15:48 -0500)
v1.0.26


Trivial merge