Merge branch 'hotfix/1.0.0' v1.0.0
authorLaury GvR <laury@gaslightmedia.com>
Thu, 29 Sep 2016 20:40:33 +0000 (16:40 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 29 Sep 2016 20:40:33 +0000 (16:40 -0400)

Trivial merge