Merge tag 'v1.0.2' into develop
authorLaury GvR <laury@gaslightmedia.com>
Thu, 13 Aug 2015 16:22:00 +0000 (12:22 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 13 Aug 2015 16:22:00 +0000 (12:22 -0400)
v1.0.2


Trivial merge