Merge branch 'release/1.0.26' v1.0.26
authorLaury GvR <laury@gaslightmedia.com>
Mon, 27 Nov 2017 20:48:29 +0000 (15:48 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 27 Nov 2017 20:48:29 +0000 (15:48 -0500)

Trivial merge