Merge branch 'hotfix/1.0.7' v1.0.7
authorLaury GvR <laury@gaslightmedia.com>
Wed, 10 Jun 2015 15:18:04 +0000 (11:18 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 10 Jun 2015 15:18:04 +0000 (11:18 -0400)

Trivial merge