Merge tag 'v1.0.2' into develop
authorLaury GvR <laury@gaslightmedia.com>
Fri, 5 Jun 2015 18:36:04 +0000 (14:36 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 5 Jun 2015 18:36:04 +0000 (14:36 -0400)
v1.0.2


Trivial merge