Merge branch 'hotfix/1.0.8' v1.0.8
authorLaury GvR <laury@gaslightmedia.com>
Wed, 30 Dec 2015 17:02:40 +0000 (12:02 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 30 Dec 2015 17:02:40 +0000 (12:02 -0500)

Trivial merge