Merge branch 'hotfix/1.0.1' v1.0.1
authorLaury GvR <laury@gaslightmedia.com>
Thu, 24 Mar 2016 17:31:16 +0000 (13:31 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 24 Mar 2016 17:31:16 +0000 (13:31 -0400)

Trivial merge