Merge tag 'v1.0.2' into develop
authorLaury GvR <laury@gaslightmedia.com>
Tue, 19 Apr 2016 20:13:31 +0000 (16:13 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 19 Apr 2016 20:13:31 +0000 (16:13 -0400)
v1.0.2


Trivial merge