Merge tag 'v1.0.2' into develop
authorLaury GvR <laury@gaslightmedia.com>
Thu, 24 Mar 2016 17:34:45 +0000 (13:34 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 24 Mar 2016 17:34:45 +0000 (13:34 -0400)
v1.0.2


Trivial merge