Merge branch 'hotfix/1.0.2' v1.0.2
authorLaury GvR <laury@gaslightmedia.com>
Fri, 30 Oct 2015 13:18:29 +0000 (09:18 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 30 Oct 2015 13:18:29 +0000 (09:18 -0400)

Trivial merge