Merge tag 'v1.2.42' into develop
authorLaury GvR <laury@gaslightmedia.com>
Wed, 22 Nov 2017 20:15:16 +0000 (15:15 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 22 Nov 2017 20:15:16 +0000 (15:15 -0500)
v1.2.42


Trivial merge