Merge branch 'hotfix/1.0.5' v1.0.5
authorLaury GvR <laury@gaslightmedia.com>
Mon, 20 Jun 2016 16:04:11 +0000 (12:04 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 20 Jun 2016 16:04:11 +0000 (12:04 -0400)

Trivial merge