Merge branch 'hotfix/1.0.5' v1.0.5
authorLaury GvR <laury@gaslightmedia.com>
Thu, 7 Jul 2016 17:44:13 +0000 (13:44 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 7 Jul 2016 17:44:13 +0000 (13:44 -0400)

Trivial merge