Merge tag 'v1.0.2' into develop
authorLaury GvR <laury@gaslightmedia.com>
Fri, 28 Aug 2015 13:58:08 +0000 (09:58 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 28 Aug 2015 13:58:08 +0000 (09:58 -0400)
v1.0.2


Trivial merge