Merge tag 'v1.0.2' into develop
authorLaury GvR <laury@gaslightmedia.com>
Wed, 17 Jun 2015 17:45:58 +0000 (13:45 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 17 Jun 2015 17:45:58 +0000 (13:45 -0400)
v1.0.2


Trivial merge