Merge branch 'hotfix/1.0.0' V1.0.0
authorLaury GvR <laury@gaslightmedia.com>
Wed, 30 Mar 2016 19:19:30 +0000 (15:19 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 30 Mar 2016 19:19:30 +0000 (15:19 -0400)

Trivial merge