Merge tag 'v1.0.2' into develop
authorLaury GvR <laury@gaslightmedia.com>
Tue, 1 Nov 2016 19:26:59 +0000 (15:26 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 1 Nov 2016 19:26:59 +0000 (15:26 -0400)
v1.0.2


Trivial merge