Merge tag 'v1.0.2' into develop
authorLaury GvR <laury@gaslightmedia.com>
Fri, 19 Feb 2016 21:41:22 +0000 (16:41 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 19 Feb 2016 21:41:22 +0000 (16:41 -0500)
v1.0.2


Trivial merge