Merge tag 'v1.0.2' into develop
authorLaury GvR <laury@gaslightmedia.com>
Tue, 9 Jun 2015 19:56:11 +0000 (15:56 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 9 Jun 2015 19:56:11 +0000 (15:56 -0400)
v1.0.2


Trivial merge