Merge tag 'v1.0.2' into develop
authorLaury GvR <laury@gaslightmedia.com>
Tue, 9 Feb 2016 18:20:14 +0000 (13:20 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 9 Feb 2016 18:20:14 +0000 (13:20 -0500)
v1.0.2


Trivial merge