Merge branch 'hotfix/1.0.5' v1.0.5
authorLaury GvR <laury@gaslightmedia.com>
Wed, 28 Oct 2015 15:06:09 +0000 (11:06 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 28 Oct 2015 15:06:09 +0000 (11:06 -0400)

Trivial merge