Merge branch 'hotfix/1.0.5' v1.0.5
authorLaury GvR <laury@gaslightmedia.com>
Wed, 1 Jun 2016 18:11:27 +0000 (14:11 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 1 Jun 2016 18:11:27 +0000 (14:11 -0400)

Trivial merge