Merge branch 'hotfix/1.0.2' v1.0.2
authorLaury GvR <laury@gaslightmedia.com>
Thu, 13 Aug 2015 16:21:55 +0000 (12:21 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 13 Aug 2015 16:21:55 +0000 (12:21 -0400)

Trivial merge