Merge branch 'hotfix/1.0.1' V1.0.1
authorLaury GvR <laury@gaslightmedia.com>
Fri, 8 Jul 2016 17:11:11 +0000 (13:11 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 8 Jul 2016 17:11:11 +0000 (13:11 -0400)

Trivial merge