Merge branch 'hotfix/1.0.5' v1.0.5
authorLaury GvR <laury@gaslightmedia.com>
Thu, 13 Aug 2015 19:28:49 +0000 (15:28 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 13 Aug 2015 19:28:49 +0000 (15:28 -0400)

Trivial merge